X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=e93f348f42359aab632c3d9738c6689200a4a9cf;hb=25d55759c94adba96336edf6780cee7138c2ec21;hp=dfa48d97ee127e95ad685006f01bbe489c3f5322;hpb=454a961e1a03f60cf05040b832c4f8f01b481fa7;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index dfa48d97e..e93f348f4 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -19,33 +19,104 @@
 
 #include <libcxml/cxml.h>
 #include "audio_content.h"
+#include "analyse_audio_job.h"
+#include "job_manager.h"
+#include "film.h"
 
+using std::string;
 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;
 int const AudioContentProperty::AUDIO_FRAME_RATE = 202;
+int const AudioContentProperty::AUDIO_GAIN = 203;
+int const AudioContentProperty::AUDIO_DELAY = 204;
+int const AudioContentProperty::AUDIO_MAPPING = 205;
 
-AudioContent::AudioContent (boost::filesystem::path f)
-	: Content (f)
+AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
+	: Content (f, s)
+	, _audio_gain (0)
+	, _audio_delay (0)
 {
 
 }
 
-AudioContent::AudioContent (shared_ptr<const cxml::Node> node)
-	: Content (node)
+AudioContent::AudioContent (shared_ptr<const Film> f, boost::filesystem::path p)
+	: Content (f, p)
+	, _audio_gain (0)
+	, _audio_delay (0)
 {
 
 }
 
+AudioContent::AudioContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+	: Content (f, node)
+{
+	_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)
 {
 
 }
 
-Time
-AudioContent::temporal_length () const
+void
+AudioContent::as_xml (xmlpp::Node* node) const
 {
-	return audio_length() / audio_frame_rate();
+	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));
+}
+
+
+void
+AudioContent::set_audio_gain (float g)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_audio_gain = g;
+	}
+	
+	signal_changed (AudioContentProperty::AUDIO_GAIN);
+}
+
+void
+AudioContent::set_audio_delay (int d)
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_audio_delay = d;
+	}
+	
+	signal_changed (AudioContentProperty::AUDIO_DELAY);
+}
+
+void
+AudioContent::analyse_audio (boost::function<void()> finished)
+{
+	shared_ptr<const Film> film = _film.lock ();
+	if (!film) {
+		return;
+	}
+	
+	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this())));
+	job->Finished.connect (finished);
+	JobManager::instance()->add (job);
+}
+
+boost::filesystem::path
+AudioContent::audio_analysis_path () const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	if (!film) {
+		return boost::filesystem::path ();
+	}
+
+	return film->audio_analysis_path (dynamic_pointer_cast<const AudioContent> (shared_from_this ()));
 }