X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=e5491480fc7737065567ad931699c0cbc57c67aa;hb=9b240c6d5d4e2189401498a99f98f41d1b15ed31;hp=539b0dfb586a4926c47e4e1f3e6678966e254ad9;hpb=cd4a82d90677cec80e891ac190000cb70767446f;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 539b0dfb5..e5491480f 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -20,6 +20,7 @@
 #include <libcxml/cxml.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
+#include "film.h"
 #include "compose.hpp"
 #include "job.h"
 
@@ -31,9 +32,9 @@ using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
-SndfileContent::SndfileContent (boost::filesystem::path f)
-	: Content (f)
-	, AudioContent (f)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, boost::filesystem::path p)
+	: Content (f, p)
+	, AudioContent (f, p)
 	, _audio_channels (0)
 	, _audio_length (0)
 	, _audio_frame_rate (0)
@@ -41,19 +42,20 @@ SndfileContent::SndfileContent (boost::filesystem::path f)
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const cxml::Node> node)
-	: Content (node)
-	, AudioContent (node)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+	: Content (f, node)
+	, AudioContent (f, node)
+	, _audio_mapping (node->node_child ("AudioMapping"))
 {
 	_audio_channels = node->number_child<int> ("AudioChannels");
-	_audio_length = node->number_child<ContentAudioFrame> ("AudioLength");
+	_audio_length = node->number_child<AudioContent::Frame> ("AudioLength");
 	_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
 }
 
 string
 SndfileContent::summary () const
 {
-	return String::compose (_("Sound file: %1"), file().filename().string());
+	return String::compose (_("%1 [audio]"), file().filename().string());
 }
 
 string
@@ -68,7 +70,7 @@ SndfileContent::information () const
 	s << String::compose (
 		_("%1 channels, %2kHz, %3 samples"),
 		audio_channels(),
-		audio_frame_rate() / 1000.0,
+		content_audio_frame_rate() / 1000.0,
 		audio_length()
 		);
 	
@@ -84,17 +86,14 @@ SndfileContent::valid_file (boost::filesystem::path f)
 	return (ext == ".wav" || ext == ".aif" || ext == ".aiff");
 }
 
-shared_ptr<Content>
-SndfileContent::clone () const
-{
-	return shared_ptr<Content> (new SndfileContent (*this));
-}
-
 void
-SndfileContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
+SndfileContent::examine (shared_ptr<Job> job)
 {
 	job->set_progress_unknown ();
-	Content::examine (film, job, quick);
+	Content::examine (job);
+
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
 
 	SndfileDecoder dec (film, shared_from_this());
 
@@ -108,6 +107,11 @@ SndfileContent::examine (shared_ptr<Film> film, shared_ptr<Job> job, bool quick)
 	signal_changed (AudioContentProperty::AUDIO_CHANNELS);
 	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 ();
+	signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
 
 void
@@ -115,8 +119,38 @@ 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));
+	_audio_mapping.as_xml (node->add_child("AudioMapping"));
+}
+
+Time
+SndfileContent::length () const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	
+	return film->audio_frames_to_time (audio_length ());
+}
+
+int
+SndfileContent::output_audio_frame_rate () const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	
+	return film->dcp_audio_frame_rate ();
 }
 
+void
+SndfileContent::set_audio_mapping (AudioMapping m)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_audio_mapping = m;
+	}
+
+	signal_changed (AudioContentProperty::AUDIO_MAPPING);
+}