Merge master.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index a9d7b73813107c64d636b5a60178cfc5324ba12a..b36dc8f9c0f5dac258533e9879f5103add8bb232 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -110,6 +110,8 @@ Film::Film (string d, bool must_exist)
        , _dirty (false)
 {
        set_dci_date_today ();
+
+       _playlist->ContentChanged.connect (bind (&Film::content_changed, this, _1, _2));
        
        /* Make state.directory a complete path without ..s (where possible)
           (Code swiped from Adam Bowen on stackoverflow)
@@ -179,6 +181,8 @@ Film::Film (Film const & o)
                _content.push_back ((*i)->clone ());
        }
        
+       _playlist->ContentChanged.connect (bind (&Film::content_changed, this, _1, _2));
+       
        _playlist->setup (_content);
 }
 
@@ -414,6 +418,7 @@ Film::write_metadata () const
        _dci_metadata.as_xml (root->add_child ("DCIMetadata"));
        root->add_child("DCPFrameRate")->add_child_text (boost::lexical_cast<string> (_dcp_frame_rate));
        root->add_child("DCIDate")->add_child_text (boost::gregorian::to_iso_string (_dci_date));
+       _audio_mapping.as_xml (root->add_child("AudioMapping"));
 
        for (ContentList::iterator i = the_content.begin(); i != the_content.end(); ++i) {
                (*i)->as_xml (root->add_child ("Content"));
@@ -485,16 +490,22 @@ Film::read_metadata ()
        for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) {
 
                string const type = (*i)->string_child ("Type");
+               boost::shared_ptr<Content> c;
                
                if (type == "FFmpeg") {
-                       _content.push_back (shared_ptr<Content> (new FFmpegContent (*i)));
+                       c.reset (new FFmpegContent (*i));
                } else if (type == "ImageMagick") {
-                       _content.push_back (shared_ptr<Content> (new ImageMagickContent (*i)));
+                       c.reset (new ImageMagickContent (*i));
                } else if (type == "Sndfile") {
-                       _content.push_back (shared_ptr<Content> (new SndfileContent (*i)));
+                       c.reset (new SndfileContent (*i));
                }
+
+               _content.push_back (c);
        }
 
+       /* This must come after we've loaded the content, as we're looking things up in _content */
+       _audio_mapping.set_from_xml (_content, f.node_child ("AudioMapping"));
+
        _dirty = false;
 
        _playlist->setup (_content);
@@ -953,6 +964,7 @@ Film::signal_changed (Property p)
        case Film::CONTENT:
                _playlist->setup (content ());
                set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ()));
+               set_audio_mapping (_playlist->default_audio_mapping ());
                break;
        default:
                break;
@@ -1037,7 +1049,6 @@ Film::add_content (shared_ptr<Content> c)
        {
                boost::mutex::scoped_lock lm (_state_mutex);
                _content.push_back (c);
-               _content_connections.push_back (c->Changed.connect (bind (&Film::content_changed, this, _1)));
        }
 
        signal_changed (CONTENT);
@@ -1054,14 +1065,6 @@ Film::remove_content (shared_ptr<Content> c)
                if (i != _content.end ()) {
                        _content.erase (i);
                }
-
-               for (list<boost::signals2::connection>::iterator i = _content_connections.begin(); i != _content_connections.end(); ++i) {
-                       i->disconnect ();
-               }
-
-               for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
-                       _content_connections.push_back (c->Changed.connect (bind (&Film::content_changed, this, _1)));
-               }
        }
 
        signal_changed (CONTENT);
@@ -1178,7 +1181,7 @@ Film::ffmpeg () const
 vector<FFmpegSubtitleStream>
 Film::ffmpeg_subtitle_streams () const
 {
-       boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+       shared_ptr<FFmpegContent> f = ffmpeg ();
        if (f) {
                return f->subtitle_streams ();
        }
@@ -1189,7 +1192,7 @@ Film::ffmpeg_subtitle_streams () const
 boost::optional<FFmpegSubtitleStream>
 Film::ffmpeg_subtitle_stream () const
 {
-       boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+       shared_ptr<FFmpegContent> f = ffmpeg ();
        if (f) {
                return f->subtitle_stream ();
        }
@@ -1200,7 +1203,7 @@ Film::ffmpeg_subtitle_stream () const
 vector<FFmpegAudioStream>
 Film::ffmpeg_audio_streams () const
 {
-       boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+       shared_ptr<FFmpegContent> f = ffmpeg ();
        if (f) {
                return f->audio_streams ();
        }
@@ -1211,7 +1214,7 @@ Film::ffmpeg_audio_streams () const
 boost::optional<FFmpegAudioStream>
 Film::ffmpeg_audio_stream () const
 {
-       boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+       shared_ptr<FFmpegContent> f = ffmpeg ();
        if (f) {
                return f->audio_stream ();
        }
@@ -1222,7 +1225,7 @@ Film::ffmpeg_audio_stream () const
 void
 Film::set_ffmpeg_subtitle_stream (FFmpegSubtitleStream s)
 {
-       boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+       shared_ptr<FFmpegContent> f = ffmpeg ();
        if (f) {
                f->set_subtitle_stream (s);
        }
@@ -1231,20 +1234,33 @@ Film::set_ffmpeg_subtitle_stream (FFmpegSubtitleStream s)
 void
 Film::set_ffmpeg_audio_stream (FFmpegAudioStream s)
 {
-       boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+       shared_ptr<FFmpegContent> f = ffmpeg ();
        if (f) {
                f->set_audio_stream (s);
        }
 }
 
 void
-Film::content_changed (int p)
+Film::set_audio_mapping (AudioMapping m)
+{
+       {
+               boost::mutex::scoped_lock lm (_state_mutex);
+               _audio_mapping = m;
+       }
+
+       signal_changed (AUDIO_MAPPING);
+}
+
+void
+Film::content_changed (boost::weak_ptr<Content> c, int p)
 {
        if (p == VideoContentProperty::VIDEO_FRAME_RATE) {
                set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ()));
-       }
+       } else if (p == AudioContentProperty::AUDIO_CHANNELS) {
+               set_audio_mapping (_playlist->default_audio_mapping ());
+       }               
 
        if (ui_signaller) {
-               ui_signaller->emit (boost::bind (boost::ref (ContentChanged), p));
+               ui_signaller->emit (boost::bind (boost::ref (ContentChanged), c, p));
        }
 }