Rename AudioContent frame_rate methods and move resampled_audio_frame_rate into Audio...

[dcpomatic.git] / src / lib / audio_content.cc

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index c84f5713011d5a02ffd7636262eafb092a9f19e2..d9e00ff1401ca4e3335ea51c2944aff404a94fae 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -150,11 +150,11 @@ string
 AudioContent::technical_summary () const
 {
        return String::compose (
-               "audio: channels %1, length %2, raw rate %3, out rate %4",
+               "audio: channels %1, length %2, content rate %3, resampled rate %4",
                audio_channels(),
                audio_length().seconds(),
-               content_audio_frame_rate(),
-               output_audio_frame_rate()
+               audio_frame_rate(),
+               resampled_audio_frame_rate()
                );
 }
 
@@ -163,3 +163,29 @@ AudioContent::set_audio_mapping (AudioMapping)
 {
        signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
+
+/** @return the frame rate that this content should be resampled to in order
+ *  that it is in sync with the active video content at its start time.
+ */
+int
+AudioContent::resampled_audio_frame_rate () const
+{
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
+       
+       /* Resample to a DCI-approved sample rate */
+       double t = dcp_audio_frame_rate (audio_frame_rate ());
+
+       FrameRateChange frc = film->active_frame_rate_change (position ());
+
+       /* Compensate if the DCP is being run at a different frame rate
+          to the source; that is, if the video is run such that it will
+          look different in the DCP compared to the source (slower or faster).
+       */
+
+       if (frc.change_speed) {
+               t /= frc.speed_up;
+       }
+
+       return rint (t);
+}