summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-27 22:40:05 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-27 22:40:05 +0000
commit866552989b82ed28964172fce1dd6b787589f8d7 (patch)
treefe6c262f24c422d79622980e0e39a730c4eb0004 /src
parentc4479d094ada131ce63225930fab630989991991 (diff)
Fix controls in main DoM.
Diffstat (limited to 'src')
-rw-r--r--src/tools/dcpomatic.cc1
-rw-r--r--src/wx/controls.cc11
-rw-r--r--src/wx/controls.h2
3 files changed, 14 insertions, 0 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index bd0c40e88..7197ee8ca 100644
--- 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 9fcdbd645..dd47aa184 100644
--- 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 d70eb9432..fd6181d91 100644
--- 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;
};