X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsndfile_content.cc;h=e757c77c5469704e48c386b81199b5532bfc91b2;hb=59e769023c392c332331567a1aea94660002c463;hp=d3acc7d2e3662a4261d56e6d077e888da4a50ede;hpb=b299c1873bf23414061d551843275c77a9256a05;p=dcpomatic.git

diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index d3acc7d2e..e757c77c5 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-2015 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
@@ -18,41 +18,45 @@
 */
 
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.h>
 #include "sndfile_content.h"
 #include "sndfile_decoder.h"
 #include "film.h"
 #include "compose.hpp"
 #include "job.h"
 #include "util.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
 using std::string;
-using std::stringstream;
 using std::cout;
 using boost::shared_ptr;
-using boost::lexical_cast;
+using dcp::raw_convert;
 
 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)
+	, SingleStreamAudioContent (f, p)
 {
 
 }
 
-SndfileContent::SndfileContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node, int version)
+SndfileContent::SndfileContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
 	: Content (f, node)
-	, AudioContent (f, node)
-	, _audio_mapping (node->node_child ("AudioMapping"), version)
+	, SingleStreamAudioContent (f, node, version)
 {
-	_audio_channels = node->number_child<int> ("AudioChannels");
-	_audio_length = node->number_child<AudioFrame> ("AudioLength");
-	_audio_frame_rate = node->number_child<int> ("AudioFrameRate");
+	
+}
+
+void
+SndfileContent::as_xml (xmlpp::Node* node) const
+{
+	node->add_child("Type")->add_child_text ("Sndfile");
+	Content::as_xml (node);
+	SingleStreamAudioContent::as_xml (node);
 }
 
+
 string
 SndfileContent::summary () const
 {
@@ -68,25 +72,6 @@ SndfileContent::technical_summary () const
 		+ " - sndfile";
 }
 
-string
-SndfileContent::information () const
-{
-	if (_audio_frame_rate == 0) {
-		return "";
-	}
-	
-	stringstream s;
-
-	s << String::compose (
-		_("%1 channels, %2kHz, %3 samples"),
-		audio_channels(),
-		content_audio_frame_rate() / 1000.0,
-		audio_length()
-		);
-	
-	return s.str ();
-}
-
 bool
 SndfileContent::valid_file (boost::filesystem::path f)
 {
@@ -101,79 +86,15 @@ 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());
-
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_audio_channels = dec.audio_channels ();
-		_audio_length = dec.audio_length ();
-		_audio_frame_rate = dec.audio_frame_rate ();
-	}
-
-	signal_changed (AudioContentProperty::AUDIO_CHANNELS);
-	signal_changed (AudioContentProperty::AUDIO_LENGTH);
-	signal_changed (AudioContentProperty::AUDIO_FRAME_RATE);
-
-	{
-		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);
-}
-
-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("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"));
+	shared_ptr<AudioExaminer> dec (new SndfileDecoder (shared_from_this()));
+	take_from_audio_examiner (dec);
 }
 
 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 (len);
+	DCPOMATIC_ASSERT (film);
+	return DCPTime (audio_length(), film->active_frame_rate_change (position ()));
 }
 
-int
-SndfileContent::output_audio_frame_rate () const
-{
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-	
-	return film->audio_frame_rate ();
-}
-
-void
-SndfileContent::set_audio_mapping (AudioMapping m)
-{
-	{
-		boost::mutex::scoped_lock lm (_mutex);
-		_audio_mapping = m;
-	}
-
-	signal_changed (AudioContentProperty::AUDIO_MAPPING);
-}