Fix crash on double-click of show-audio button.

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

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 100264d440f9bcd5d4fb05fc13553532f686a806..97372b962a7285368d2317d1d3be5c769d313eb4 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -22,8 +22,12 @@
 #include "analyse_audio_job.h"
 #include "job_manager.h"
 #include "film.h"
+#include "exceptions.h"
+
+#include "i18n.h"
 
 using std::string;
+using std::vector;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::dynamic_pointer_cast;
@@ -54,13 +58,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 (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));
@@ -89,17 +119,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