Merge master.

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 7069499641933bbb266a21532d72f2a0ce977d77..d3acc7d2e3662a4261d56e6d077e888da4a50ede 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -43,13 +43,13 @@ SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::pat
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
        : Content (f, node)
        , AudioContent (f, node)
-       , _audio_mapping (node->node_child ("AudioMapping"))
+       , _audio_mapping (node->node_child ("AudioMapping"), version)
 {
        _audio_channels = node->number_child<int> ("AudioChannels");
-       _audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
+       _audio_length = node->number_child<AudioFrame> ("AudioLength");
        _audio_frame_rate = node->number_child<int> ("AudioFrameRate");
 }
 
@@ -141,13 +141,21 @@ SndfileContent::as_xml (xmlpp::Node* node) const
        _audio_mapping.as_xml (node->add_child("AudioMapping"));
 }
 
-Time
+DCPTime
 SndfileContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
+
+       AudioFrame const len = audio_length() * output_audio_frame_rate() / content_audio_frame_rate ();
+       
+       /* XXX: this depends on whether, alongside this audio, we are running video slower or faster than
+          it should be.  The calculation above works out the output audio frames assuming that we are just
+          resampling the audio: it would be incomplete if, for example, we were running this audio alongside
+          25fps video that was being run at 24fps.
+       */
        
-       return film->audio_frames_to_time (audio_length ());
+       return film->audio_frames_to_time (len);
 }
 
 int