X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=3efba6fd5db219c38e6f93249d28155786020934;hb=491daf8790f35611052d8954d5d74df275dcda18;hp=a8388ab77b24cb1441e1c19a0905e01ec775a193;hpb=6e7a497e9802635de713e350593b12c783a0f64c;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index a8388ab77..3efba6fd5 100644
--- 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,9 +32,7 @@ using std::string;
 using std::stringstream;
 using std::cout;
 using boost::shared_ptr;
-using boost::lexical_cast;
-
-int const SndfileContentProperty::VIDEO_FRAME_RATE = 600;
+using libdcp::raw_convert;
 
 SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
@@ -137,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"));
 }
 
@@ -149,24 +148,16 @@ SndfileContent::full_length () const
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
 
-	float const rate = _video_frame_rate.get_value_or (film->video_frame_rate ());
+	FrameRateChange frc = film->active_frame_rate_change (position ());
+
 	OutputAudioFrame const len = divide_with_round (
-		audio_length() * output_audio_frame_rate() * rate,
+		audio_length() * output_audio_frame_rate() * frc.source,
 		content_audio_frame_rate() * film->video_frame_rate()
 		);
 	
 	return film->audio_frames_to_time (len);
 }
 
-int
-SndfileContent::output_audio_frame_rate () const
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	return film->audio_frame_rate ();
-}
-
 void
 SndfileContent::set_audio_mapping (AudioMapping m)
 {
@@ -177,18 +168,3 @@ SndfileContent::set_audio_mapping (AudioMapping m)
 
 	signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
-
-float
-SndfileContent::video_frame_rate () const
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		if (_video_frame_rate) {
-			return _video_frame_rate.get ();
-		}
-	}
-
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	return film->video_frame_rate ();
-}