Bump version

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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 98171a8433ec768fda8ce9bd6bed99ebd8fe9d9f..3efba6fd5db219c38e6f93249d28155786020934 100644 (file)
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_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
@@ -18,6 +18,7 @@
 */
 
 #include <libcxml/cxml.h>
+#include <libdcp/raw_convert.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "film.h"
@@ -31,7 +32,7 @@ using std::string;
 using std::stringstream;
 using std::cout;
 using boost::shared_ptr;
-using boost::lexical_cast;
+using libdcp::raw_convert;
 
 SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
        : Content (f, p)
@@ -135,9 +136,9 @@ SndfileContent::as_xml (xmlpp::Node* node) const
        Content::as_xml (node);
        AudioContent::as_xml (node);
 
-       node->add_child("AudioChannels")->add_child_text (lexical_cast<string> (audio_channels ()));
-       node->add_child("AudioLength")->add_child_text (lexical_cast<string> (audio_length ()));
-       node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (content_audio_frame_rate ()));
+       node->add_child("AudioChannels")->add_child_text (raw_convert<string> (audio_channels ()));
+       node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
+       node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (content_audio_frame_rate ()));
        _audio_mapping.as_xml (node->add_child("AudioMapping"));
 }
 
@@ -147,24 +148,14 @@ 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 (len);
-}
+       FrameRateChange frc = film->active_frame_rate_change (position ());
 
-int
-SndfileContent::output_audio_frame_rate () const
-{
-       shared_ptr<const Film> film = _film.lock ();
-       assert (film);
+       OutputAudioFrame const len = divide_with_round (
+               audio_length() * output_audio_frame_rate() * frc.source,
+               content_audio_frame_rate() * film->video_frame_rate()
+               );
        
-       return film->audio_frame_rate ();
+       return film->audio_frames_to_time (len);
 }
 
 void