X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=cbdbe0f36626592dbddbcdacd6bc8bb3c1ab44fd;hb=4408e6eea87ce9630e71e4a7d40e2dade091b0ee;hp=5380cbd9bed582cd7716ade2096b7c5c34dc2065;hpb=98664996b6a7ef62cbff49a174917a456f218e76;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 5380cbd9b..cbdbe0f36 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -68,8 +68,12 @@ FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer) * @param p Property of the Film that has changed. */ void -FilmEditor::film_changed (Film::Property p) +FilmEditor::film_change (ChangeType type, Film::Property p) { + if (type != CHANGE_TYPE_DONE) { + return; + } + ensure_ui_thread (); if (!_film) { @@ -86,8 +90,12 @@ FilmEditor::film_changed (Film::Property p) } void -FilmEditor::film_content_changed (int property) +FilmEditor::film_content_change (ChangeType type, int property) { + if (type != CHANGE_TYPE_DONE) { + return; + } + ensure_ui_thread (); if (!_film) { @@ -117,8 +125,8 @@ FilmEditor::set_film (shared_ptr film) _dcp_panel->set_film (_film); if (_film) { - _film->Changed.connect (bind (&FilmEditor::film_changed, this, _1)); - _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _2)); + _film->Change.connect (bind (&FilmEditor::film_change, this, _1, _2)); + _film->ContentChange.connect (bind (&FilmEditor::film_content_change, this, _1, _3)); } if (_film && _film->directory()) {