X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=aa31f52c0aafe4cb09d16d4e97d05f536ef020d3;hb=f36136e70efbc19255142319a1676f25fa55f780;hp=d8435613d6123a7a3bfa74a6448e4bada940aebf;hpb=6dd3777a0074f6f97c7f7286621006a1c14376e8;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index d8435613d..aa31f52c0 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -20,6 +20,7 @@
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "sndfile_examiner.h"
+#include "audio_content.h"
 #include "film.h"
 #include "compose.hpp"
 #include "job.h"
@@ -39,29 +40,41 @@ using boost::shared_ptr;
 
 SndfileContent::SndfileContent (shared_ptr<const Film> film, boost::filesystem::path p)
 	: Content (film, p)
-	, AudioContent (film, p)
 {
-
+	audio.reset (new AudioContent (this));
 }
 
 SndfileContent::SndfileContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
 	: Content (film, node)
-	, AudioContent (film, node)
-	, _audio_length (node->number_child<Frame> ("AudioLength"))
-	, _audio_stream (new AudioStream (node->number_child<int> ("AudioFrameRate"), AudioMapping (node->node_child ("AudioMapping"), version)))
 {
-
+	audio = AudioContent::from_xml (this, node);
+
+	if (audio) {
+		audio->set_stream (
+			AudioStreamPtr (
+				new AudioStream (
+					node->number_child<int> ("AudioFrameRate"),
+					node->number_child<Frame> ("AudioLength"),
+					AudioMapping (node->node_child ("AudioMapping"), version)
+					)
+				)
+			);
+	}
 }
 
 void
 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("AudioFrameRate")->add_child_text (raw_convert<string> (audio_stream()->frame_rate ()));
-	audio_stream()->mapping().as_xml (node->add_child("AudioMapping"));
-	node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio_length ()));
+
+	if (audio) {
+		audio->as_xml (node);
+		node->add_child("AudioFrameRate")->add_child_text (raw_convert<string> (audio->stream()->frame_rate ()));
+		node->add_child("AudioLength")->add_child_text (raw_convert<string> (audio->stream()->length ()));
+		audio->stream()->mapping().as_xml (node->add_child("AudioMapping"));
+	}
 }
 
 
@@ -76,7 +89,7 @@ string
 SndfileContent::technical_summary () const
 {
 	return Content::technical_summary() + " - "
-		+ AudioContent::technical_summary ()
+		+ audio->technical_summary ()
 		+ " - sndfile";
 }
 
@@ -94,36 +107,23 @@ SndfileContent::examine (shared_ptr<Job> job)
 {
 	job->set_progress_unknown ();
 	Content::examine (job);
-	shared_ptr<AudioExaminer> dec (new SndfileExaminer (shared_from_this ()));
-	take_from_audio_examiner (dec);
-}
+	shared_ptr<AudioExaminer> ex (new SndfileExaminer (shared_from_this ()));
 
-void
-SndfileContent::take_from_audio_examiner (shared_ptr<AudioExaminer> examiner)
-{
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_audio_stream.reset (new AudioStream (examiner->audio_frame_rate(), examiner->audio_channels ()));
-		AudioMapping m = _audio_stream->mapping ();
+		AudioStreamPtr as (new AudioStream (ex->audio_frame_rate(), ex->audio_length(), ex->audio_channels ()));
+		audio->set_stream (as);
+		AudioMapping m = as->mapping ();
 		film()->make_audio_mapping_default (m);
-		_audio_stream->set_mapping (m);
-		_audio_length = examiner->audio_length ();
+		as->set_mapping (m);
 	}
 
-	signal_changed (AudioContentProperty::AUDIO_STREAMS);
+	signal_changed (AudioContentProperty::STREAMS);
 }
 
 DCPTime
 SndfileContent::full_length () const
 {
-	FrameRateChange const frc (audio_video_frame_rate(), film()->video_frame_rate());
-	return DCPTime::from_frames (audio_length() / frc.speed_up, audio_stream()->frame_rate ());
-}
-
-vector<AudioStreamPtr>
-SndfileContent::audio_streams () const
-{
-	vector<AudioStreamPtr> s;
-	s.push_back (_audio_stream);
-	return s;
+	FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
+	return DCPTime::from_frames (audio->stream()->length() / frc.speed_up, audio->stream()->frame_rate ());
 }