diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-19 01:04:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-19 01:29:04 +0100 |
| commit | 6c7489e5d778d3e71065d88a094a7383ba2c117d (patch) | |
| tree | e3f05ad03095d88d297c7d61e03e265d28a97fa3 /src/wx/timeline.h | |
| parent | 9a27d60ea7888d300a5a2414a477091428589b82 (diff) | |
Replace May/Done/NotDone signal sets with one signal and extend
this treatment to anything that caused Player::setup_pieces. This should
fix out-of-sequence Player emissions caused by setup_pieces being called
by one thread while the butler is calling pass().
Diffstat (limited to 'src/wx/timeline.h')
| -rw-r--r-- | src/wx/timeline.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/timeline.h b/src/wx/timeline.h index 2214ee13f..9f3a4a47b 100644 --- a/src/wx/timeline.h +++ b/src/wx/timeline.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -92,7 +92,7 @@ private: void mouse_moved_select (wxMouseEvent &); void mouse_moved_zoom (wxMouseEvent &); void film_changed (Film::Property); - void film_content_changed (int, bool frequent); + void film_content_change (ChangeType type, int, bool frequent); void resized (); void assign_tracks (); void set_position_from_event (wxMouseEvent &); @@ -139,5 +139,5 @@ private: static int const _minimum_pixels_per_track; boost::signals2::scoped_connection _film_changed_connection; - boost::signals2::scoped_connection _film_content_changed_connection; + boost::signals2::scoped_connection _film_content_change_connection; }; |