diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-19 13:55:46 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-19 13:55:46 +0100 |
| commit | 4408e6eea87ce9630e71e4a7d40e2dade091b0ee (patch) | |
| tree | 634dd286de7ee2b18cbdc6bcb8837b52b2f8655f /src/wx/timeline.cc | |
| parent | 67c604d3fa2391b98ea436e2c6412f1c83a98f77 (diff) | |
Similar pending/done for Film::Change.
Diffstat (limited to 'src/wx/timeline.cc')
| -rw-r--r-- | src/wx/timeline.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 7353baf82..0231bc400 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -105,11 +105,11 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film) _main_canvas->Bind (wxEVT_SCROLLWIN_PAGEDOWN, boost::bind (&Timeline::scrolled, this, _1)); _main_canvas->Bind (wxEVT_SCROLLWIN_THUMBTRACK, boost::bind (&Timeline::scrolled, this, _1)); - film_changed (Film::CONTENT); + film_change (CHANGE_TYPE_DONE, Film::CONTENT); SetMinSize (wxSize (640, 4 * pixels_per_track() + 96)); - _film_changed_connection = film->Changed.connect (bind (&Timeline::film_changed, this, _1)); + _film_changed_connection = film->Change.connect (bind (&Timeline::film_change, this, _1, _2)); _film_content_change_connection = film->ContentChange.connect (bind (&Timeline::film_content_change, this, _1, _3, _4)); setup_scrollbars (); @@ -197,8 +197,12 @@ Timeline::paint_main () } void -Timeline::film_changed (Film::Property p) +Timeline::film_change (ChangeType type, Film::Property p) { + if (type != CHANGE_TYPE_DONE) { + return; + } + if (p == Film::CONTENT || p == Film::REEL_TYPE || p == Film::REEL_LENGTH) { ensure_ui_thread (); recreate_views (); |