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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index d3acc7d2e..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
@@ -49,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<AudioFrame> ("AudioLength");
+	_audio_length = ContentTime (node->number_child<int64_t> ("AudioLength"));
 	_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
 }
 
@@ -81,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 ();
@@ -102,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);
@@ -136,7 +133,7 @@ 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"));
 }
@@ -146,16 +143,7 @@ SndfileContent::full_length () const
 {
 	shared_ptr<const Film> film = _film.lock ();
 	assert (film);
-
-	AudioFrame 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 (len);
+	return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
 }
 
 int
@@ -177,3 +165,4 @@ SndfileContent::set_audio_mapping (AudioMapping m)
 
 	signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
+