Merge master.

[dcpomatic.git] / src / lib / audio_content.cc

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index e0eaacb919137f74a89756f61714da9d38eaf0f4..6da5afa0c986a22bd45a52f90f434d9fab0df4bf 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -22,8 +22,13 @@
 #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;
@@ -35,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 ())
 {
 
 }
@@ -46,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 ())
 {
 
 }
@@ -60,6 +65,28 @@ AudioContent::AudioContent (shared_ptr<const Film> f, shared_ptr<const cxml::Nod
        _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
 {
@@ -93,17 +120,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 +141,19 @@ 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 ();
+       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, raw rate %3, out rate %4",
+               audio_channels(),
+               audio_length().seconds(),
+               content_audio_frame_rate(),
+               output_audio_frame_rate()
+               );
 }