diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-19 17:14:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-19 18:58:24 +0100 |
| commit | 7b12e1995891da95d898608215cfe7f3e8c3facc (patch) | |
| tree | 7e22fd9321d7a93bd8dbcec08e92a692430e7985 /src | |
| parent | bd453939da140ea994282e1c167ea5f8d02e2d94 (diff) | |
Some missing ui_signaller use.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/content.cc | 5 | ||||
| -rw-r--r-- | src/lib/player.cc | 2 | ||||
| -rw-r--r-- | src/wx/film_editor.cc | 2 | ||||
| -rw-r--r-- | src/wx/timeline.cc | 4 |
4 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 531dbc38f..cca4d56de 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -23,6 +23,7 @@ #include "content.h" #include "util.h" #include "content_factory.h" +#include "ui_signaller.h" using std::string; using std::set; @@ -78,7 +79,9 @@ Content::examine (shared_ptr<Job>) void Content::signal_changed (int p) { - Changed (shared_from_this (), p, _change_signals_frequent); + if (ui_signaller) { + ui_signaller->emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); + } } void diff --git a/src/lib/player.cc b/src/lib/player.cc index 1ffced425..98a31ae74 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -45,7 +45,7 @@ using boost::shared_ptr; using boost::weak_ptr; using boost::dynamic_pointer_cast; -#define DEBUG_PLAYER 1 +//#define DEBUG_PLAYER 1 class Piece { diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index fe332e335..83e8c619f 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -672,6 +672,8 @@ FilmEditor::film_changed (Film::Property p) void FilmEditor::film_content_changed (weak_ptr<Content> weak_content, int property) { + ensure_ui_thread (); + if (!_film) { /* We call this method ourselves (as well as using it as a signal handler) so _film can be 0. diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 116ff8191..c7276a081 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -176,6 +176,8 @@ private: void content_changed (int p, bool frequent) { + ensure_ui_thread (); + if (p == ContentProperty::START || p == ContentProperty::LENGTH) { force_redraw (); } @@ -378,6 +380,8 @@ Timeline::paint (wxPaintEvent &) void Timeline::playlist_changed () { + ensure_ui_thread (); + shared_ptr<const Film> fl = _film.lock (); if (!fl) { return; |