diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-02 22:36:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-02 22:36:38 +0100 |
| commit | 2343509c75673d3fad82a5d0eab9622a4d6902e3 (patch) | |
| tree | 777097f8137cf9147a1dec783f58a133fb4235ae /src/lib | |
| parent | 7f203e4df9ca94a44099c26158c6c81b5299567f (diff) | |
Fix a few more things.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film.cc | 16 | ||||
| -rw-r--r-- | src/lib/film.h | 1 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 9c4e8b50e..d58f7fd53 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -951,6 +951,15 @@ Film::signal_changed (Property p) _dirty = true; } + switch (p) { + case Film::CONTENT: + _playlist->setup (content ()); + set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ())); + break; + default: + break; + } + if (ui_signaller) { ui_signaller->emit (boost::bind (boost::ref (Changed), p)); } @@ -1031,7 +1040,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))); - _playlist->setup (_content); } signal_changed (CONTENT); @@ -1056,8 +1064,6 @@ Film::remove_content (shared_ptr<Content> c) for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) { _content_connections.push_back (c->Changed.connect (bind (&Film::content_changed, this, _1))); } - - _playlist->setup (_content); } signal_changed (CONTENT); @@ -1158,6 +1164,10 @@ Film::video_length () const void Film::content_changed (int p) { + if (p == VideoContentProperty::VIDEO_FRAME_RATE) { + set_dcp_frame_rate (best_dcp_frame_rate (video_frame_rate ())); + } + if (ui_signaller) { ui_signaller->emit (boost::bind (boost::ref (ContentChanged), p)); } diff --git a/src/lib/film.h b/src/lib/film.h index f0a85fbf3..63a86bc43 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -134,7 +134,6 @@ public: AB, AUDIO_GAIN, AUDIO_DELAY, - SUBTITLE_STREAM, WITH_SUBTITLES, SUBTITLE_OFFSET, SUBTITLE_SCALE, |