diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-01-08 22:22:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-08 22:22:01 +0100 |
| commit | 579d18cb7770efe2da03afaf6a33faaf624119e3 (patch) | |
| tree | cc303d8c74e64fff8eb5a663941cac4455154ae9 /src/wx/timeline.h | |
| parent | dde431cafbb20ed3356ad5592be56af1d4458f46 (diff) | |
| parent | 23590dc430e4ef2351209e30a26ba04fecca2872 (diff) | |
Merge a set of changes which run the OpenGL video updates in a separatev2.15.40
thread, hopefully making things more elegant and robust.
Diffstat (limited to 'src/wx/timeline.h')
| -rw-r--r-- | src/wx/timeline.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/timeline.h b/src/wx/timeline.h index ef887dab8..44a897371 100644 --- a/src/wx/timeline.h +++ b/src/wx/timeline.h @@ -104,7 +104,7 @@ private: void set_pixels_per_second (double pps); void set_pixels_per_track (int h); void zoom_all (); - void position_change (); + void update_playhead (); boost::shared_ptr<TimelineView> event_to_view (wxMouseEvent &); TimelineContentViewList selected_views () const; @@ -137,11 +137,11 @@ private: int _y_scroll_rate; int _pixels_per_track; bool _first_resize; + wxTimer _timer; static double const _minimum_pixels_per_second; static int const _minimum_pixels_per_track; boost::signals2::scoped_connection _film_changed_connection; boost::signals2::scoped_connection _film_content_change_connection; - boost::signals2::scoped_connection _viewer_position_change_connection; }; |