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

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 2ca00cf6d..d3acc7d2e 100644
--- 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,13 +43,13 @@ 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");
+	_audio_length = node->number_child<AudioFrame> ("AudioLength");
 	_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
 }
 
@@ -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
@@ -64,7 +65,7 @@ SndfileContent::technical_summary () const
 {
 	return Content::technical_summary() + " - "
 		+ AudioContent::technical_summary ()
-		+ "sndfile";
+		+ " - sndfile";
 }
 
 string
@@ -117,9 +118,13 @@ SndfileContent::examine (shared_ptr<Job> job)
 	signal_changed (AudioContentProperty::AUDIO_LENGTH);
 	signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
 
-	/* XXX: do this in signal_changed...? */
-	_audio_mapping = AudioMapping (_audio_channels);
-	_audio_mapping.make_default ();
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		/* XXX: do this in signal_changed...? */
+		_audio_mapping = AudioMapping (_audio_channels);
+		_audio_mapping.make_default ();
+	}
+	
 	signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
 
@@ -129,19 +134,28 @@ SndfileContent::as_xml (xmlpp::Node* node) const
 	node->add_child("Type")->add_child_text ("Sndfile");
 	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> (_audio_frame_rate));
+
+	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 ()));
 	_audio_mapping.as_xml (node->add_child("AudioMapping"));
 }
 
-Time
-SndfileContent::length () const
+DCPTime
+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 (audio_length ());
+	return film->audio_frames_to_time (len);
 }
 
 int