Fix rounding of timecodes in at least some cases (#323).

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index d57cf04e3413b4b81baa97752c4ea0987ac881a3..98171a8433ec768fda8ce9bd6bed99ebd8fe9d9f 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -23,6 +23,7 @@
 #include "film.h"
 #include "compose.hpp"
 #include "job.h"
+#include "util.h"
 
 #include "i18n.h"
 
@@ -42,10 +43,10 @@ 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");
@@ -56,7 +57,7 @@ string
 SndfileContent::summary () const
 {
        /* Get the string() here so that the name does not have quotes around it */
-       return String::compose (_("%1 [audio]"), path().filename().string());
+       return String::compose (_("%1 [audio]"), path_summary ());
 }
 
 string
@@ -145,8 +146,16 @@ SndfileContent::full_length () const
 {
        shared_ptr<const Film> film = _film.lock ();
        assert (film);
+
+       OutputAudioFrame const len = divide_with_round (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