X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=6da5afa0c986a22bd45a52f90f434d9fab0df4bf;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=9940574f93bf8cbf11c726638a98a2aec1dc5ce6;hpb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 9940574f9..6da5afa0c 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -19,11 +19,19 @@
 
 #include <libcxml/cxml.h>
 #include "audio_content.h"
+#include "analyse_audio_job.h"
+#include "job_manager.h"
 #include "film.h"
+#include "exceptions.h"
+#include "config.h"
+
+#include "i18n.h"
 
 using std::string;
+using std::vector;
 using boost::shared_ptr;
 using boost::lexical_cast;
+using boost::dynamic_pointer_cast;
 
 int const AudioContentProperty::AUDIO_CHANNELS = 200;
 int const AudioContentProperty::AUDIO_LENGTH = 201;
@@ -32,10 +40,10 @@ int const AudioContentProperty::AUDIO_GAIN = 203;
 int const AudioContentProperty::AUDIO_DELAY = 204;
 int const AudioContentProperty::AUDIO_MAPPING = 205;
 
-AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
+AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s)
 	: Content (f, s)
 	, _audio_gain (0)
-	, _audio_delay (0)
+	, _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
@@ -43,7 +51,7 @@ AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
 AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	: Content (f, p)
 	, _audio_gain (0)
-	, _audio_delay (0)
+	, _audio_delay (Config::instance()->default_audio_delay ())
 {
 
 }
@@ -51,21 +59,39 @@ AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
 AudioContent::AudioContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
 	: Content (f, node)
 {
+	LocaleGuard lg;
+	
 	_audio_gain = node->number_child<float> ("AudioGain");
 	_audio_delay = node->number_child<int> ("AudioDelay");
 }
 
-AudioContent::AudioContent (AudioContent const & o)
-	: Content (o)
-	, _audio_gain (o._audio_gain)
-	, _audio_delay (o._audio_delay)
+AudioContent::AudioContent (shared_ptr<const Film> f, vector<shared_ptr<Content> > c)
+	: Content (f, c)
 {
+	shared_ptr<AudioContent> ref = dynamic_pointer_cast<AudioContent> (c[0]);
+	assert (ref);
+	
+	for (size_t i = 0; i < c.size(); ++i) {
+		shared_ptr<AudioContent> ac = dynamic_pointer_cast<AudioContent> (c[i]);
+
+		if (ac->audio_gain() != ref->audio_gain()) {
+			throw JoinError (_("Content to be joined must have the same audio gain."));
+		}
+
+		if (ac->audio_delay() != ref->audio_delay()) {
+			throw JoinError (_("Content to be joined must have the same audio delay."));
+		}
+	}
 
+	_audio_gain = ref->audio_gain ();
+	_audio_delay = ref->audio_delay ();
 }
 
 void
 AudioContent::as_xml (xmlpp::Node* node) const
 {
+	LocaleGuard lg;
+	
 	boost::mutex::scoped_lock lm (_mutex);
 	node->add_child("AudioGain")->add_child_text (lexical_cast<string> (_audio_gain));
 	node->add_child("AudioDelay")->add_child_text (lexical_cast<string> (_audio_delay));
@@ -93,3 +119,41 @@ AudioContent::set_audio_delay (int d)
 	
 	signal_changed (AudioContentProperty::AUDIO_DELAY);
 }
+
+boost::signals2::connection
+AudioContent::analyse_audio (boost::function<void()> finished)
+{
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	
+	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this())));
+	boost::signals2::connection c = job->Finished.connect (finished);
+	JobManager::instance()->add (job);
+
+	return c;
+}
+
+boost::filesystem::path
+AudioContent::audio_analysis_path () const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	if (!film) {
+		return boost::filesystem::path ();
+	}
+
+	boost::filesystem::path p = film->audio_analysis_dir ();
+	p /= digest ();
+	return p;
+}
+
+string
+AudioContent::technical_summary () const
+{
+	return String::compose (
+		"audio: channels %1, length %2, raw rate %3, out rate %4",
+		audio_channels(),
+		audio_length().seconds(),
+		content_audio_frame_rate(),
+		output_audio_frame_rate()
+		);
+}