Fix controls in main DoM.

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index bd0c40e889d9c977d543766fb75d4255063cfc02..7197ee8cace71b004665e2e40f61734a0a69ca27 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -439,6 +439,7 @@ public:
                _film = film;
                _film_viewer->set_film (_film);
                _film_editor->set_film (_film);
+               _controls->set_film (_film);
                if (_video_waveform_dialog) {
                        _video_waveform_dialog->Destroy ();
                        _video_waveform_dialog = 0;

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 9fcdbd645b59daefd77f02708d845a43d8fdf0bb..dd47aa184695c3a31c6a64a4b4f4823950178ada 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -362,6 +362,7 @@ Controls::set_film (shared_ptr<Film> film)
        }
 
        _film = film;
+       _film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2));
 
        setup_sensitivity ();
 
@@ -374,3 +375,13 @@ Controls::film () const
 {
        return _film;
 }
+
+void
+Controls::film_change (ChangeType type, Film::Property p)
+{
+       if (type == CHANGE_TYPE_DONE && p == Film::CONTENT) {
+               setup_sensitivity ();
+               update_position_label ();
+               update_position_slider ();
+       }
+}

diff --git a/src/wx/controls.h b/src/wx/controls.h
index d70eb9432ba024b0e359638e203b57393b81d056..fd6181d91d193ada92c17d10d9c6657f5808eb3a 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -87,6 +87,7 @@ private:
        void outline_content_changed ();
        void eye_changed ();
        void position_changed ();
+       void film_change (ChangeType, Film::Property);
 
        typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
 
@@ -104,6 +105,7 @@ private:
 
        ClosedCaptionsDialog* _closed_captions_dialog;
 
+       boost::signals2::scoped_connection _film_change_connection;
        boost::signals2::scoped_connection _config_changed_connection;
 };