Merge branch '1.0' into 1.0-seek

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index c7879202f471c6ac5a2f2f978215b35cffc39300..1c872cf96ef165d6685c8fe01caadbce36ba2509 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -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);
+
+       OutputAudioFrame 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