X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.cc;h=03bfe9630a9cb304de9d23c54456c7cf432c1fcc;hb=8102046b2f29e0c7b234c29bf204b056cb30e64f;hp=e0eaacb919137f74a89756f61714da9d38eaf0f4;hpb=39960754026821775e6753a83f6934b8befa0dc2;p=dcpomatic.git

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index e0eaacb91..03bfe9630 100644
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 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,15 +18,22 @@
 */
 
 #include <libcxml/cxml.h>
+#include <dcp/raw_convert.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::cout;
+using std::vector;
 using boost::shared_ptr;
-using boost::lexical_cast;
 using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
 
 int const AudioContentProperty::AUDIO_CHANNELS = 200;
 int const AudioContentProperty::AUDIO_LENGTH = 201;
@@ -35,10 +42,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 ())
 {
 
 }
@@ -46,28 +53,46 @@ 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 ())
 {
 
 }
 
-AudioContent::AudioContent (shared_ptr<const Film> f, shared_ptr<const cxml::Node> node)
+AudioContent::AudioContent (shared_ptr<const Film> f, cxml::ConstNodePtr node)
 	: Content (f, node)
 {
-	LocaleGuard lg;
-	
 	_audio_gain = node->number_child<float> ("AudioGain");
 	_audio_delay = node->number_child<int> ("AudioDelay");
 }
 
+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));
+	node->add_child("AudioGain")->add_child_text (raw_convert<string> (_audio_gain));
+	node->add_child("AudioDelay")->add_child_text (raw_convert<string> (_audio_delay));
 }
 
 
@@ -93,17 +118,17 @@ AudioContent::set_audio_delay (int d)
 	signal_changed (AudioContentProperty::AUDIO_DELAY);
 }
 
-void
+boost::signals2::connection
 AudioContent::analyse_audio (boost::function<void()> finished)
 {
 	shared_ptr<const Film> film = _film.lock ();
-	if (!film) {
-		return;
-	}
+	assert (film);
 	
 	shared_ptr<AnalyseAudioJob> job (new AnalyseAudioJob (film, dynamic_pointer_cast<AudioContent> (shared_from_this())));
-	job->Finished.connect (finished);
+	boost::signals2::connection c = job->Finished.connect (finished);
 	JobManager::instance()->add (job);
+
+	return c;
 }
 
 boost::filesystem::path
@@ -114,11 +139,51 @@ AudioContent::audio_analysis_path () const
 		return boost::filesystem::path ();
 	}
 
-	return film->audio_analysis_path (dynamic_pointer_cast<const AudioContent> (shared_from_this ()));
+	boost::filesystem::path p = film->audio_analysis_dir ();
+	p /= digest() + "_" + audio_mapping().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(), content_audio_frame_rate(), output_audio_frame_rate());
+	return String::compose (
+		"audio: channels %1, length %2, content rate %3, resampled rate %4",
+		audio_channels(),
+		audio_length().seconds(),
+		audio_frame_rate(),
+		resampled_audio_frame_rate()
+		);
+}
+
+void
+AudioContent::set_audio_mapping (AudioMapping)
+{
+	signal_changed (AudioContentProperty::AUDIO_MAPPING);
+}
+
+/** @return the frame rate that this content should be resampled to in order
+ *  that it is in sync with the active video content at its start time.
+ */
+int
+AudioContent::resampled_audio_frame_rate () const
+{
+	shared_ptr<const Film> film = _film.lock ();
+	assert (film);
+	
+	/* Resample to a DCI-approved sample rate */
+	double t = dcp_audio_frame_rate (audio_frame_rate ());
+
+	FrameRateChange frc = film->active_frame_rate_change (position ());
+
+	/* Compensate if the DCP is being run at a different frame rate
+	   to the source; that is, if the video is run such that it will
+	   look different in the DCP compared to the source (slower or faster).
+	*/
+
+	if (frc.change_speed) {
+		t /= frc.speed_up;
+	}
+
+	return rint (t);
 }