X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;fp=src%2Flib%2Fsndfile_content.cc;h=2d7fa1c1cf9446e0a26cedf13db62bd911cc6df6;hp=a8388ab77b24cb1441e1c19a0905e01ec775a193;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=931fa4ef2dbfb7c9f726c4dd41eea79621b49906

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index a8388ab77..2d7fa1c1c 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
@@ -33,8 +33,6 @@ using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
-int const SndfileContentProperty::VIDEO_FRAME_RATE = 600;
-
 SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
 	, AudioContent (f, p)
@@ -51,7 +49,7 @@ SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml:
 	, _audio_mapping (node->node_child ("AudioMapping"), version)
 {
 	_audio_channels = node->number_child<int> ("AudioChannels");
-	_audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
+	_audio_length = ContentTime (node->number_child<int64_t> ("AudioLength"));
 	_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
 }
 
@@ -83,7 +81,7 @@ SndfileContent::information () const
 		_("%1 channels, %2kHz, %3 samples"),
 		audio_channels(),
 		content_audio_frame_rate() / 1000.0,
-		audio_length()
+		audio_length().frames (content_audio_frame_rate ())
 		);
 	
 	return s.str ();
@@ -104,10 +102,7 @@ SndfileContent::examine (shared_ptr<Job> job)
 	job->set_progress_unknown ();
 	Content::examine (job);
 
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-
-	SndfileDecoder dec (film, shared_from_this());
+	SndfileDecoder dec (shared_from_this());
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -138,24 +133,17 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 	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("AudioLength")->add_child_text (lexical_cast<string> (audio_length().get ()));
 	node->add_child("AudioFrameRate")->add_child_text (lexical_cast<string> (content_audio_frame_rate ()));
 	_audio_mapping.as_xml (node->add_child("AudioMapping"));
 }
 
-Time
+DCPTime
 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 ());
-	OutputAudioFrame const len = divide_with_round (
-		audio_length() * output_audio_frame_rate() * rate,
-		content_audio_frame_rate() * film->video_frame_rate()
-		);
-	
-	return film->audio_frames_to_time (len);
+	return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
 }
 
 int
@@ -178,17 +166,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 ();
-}