summaryrefslogtreecommitdiff
path: root/src/wx/film_viewer.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-10-20 22:13:46 +0200
committerCarl Hetherington <cth@carlh.net>2020-01-08 21:56:47 +0100
commitc76b1fd7fe41a7e371ae1fe1dad21c87a19839f1 (patch)
treea487e093d93895fafb529edd6c4ae0e6e8030c3e /src/wx/film_viewer.h
parentdde431cafbb20ed3356ad5592be56af1d4458f46 (diff)
Move ::timer into SimpleVideoView.
Diffstat (limited to 'src/wx/film_viewer.h')
-rw-r--r--src/wx/film_viewer.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 1f20c3321..d64eef4a9 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -149,8 +149,11 @@ public:
boost::signals2::signal<bool ()> PlaybackPermitted;
private:
+
+ /* XXX_b: to remove */
+ friend class SimpleVideoView;
+
void video_view_sized ();
- void timer ();
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
bool get (bool lazy);
@@ -172,7 +175,6 @@ private:
boost::shared_ptr<Player> _player;
VideoView* _video_view;
- wxTimer _timer;
bool _coalesce_player_changes;
std::list<int> _pending_player_changes;