From ff64d7f42884bb21e61c5f5b242c41415a5934b1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 20 Oct 2019 22:24:41 +0200 Subject: [PATCH] Remove temporary access to timer() method. --- src/wx/film_viewer.cc | 2 +- src/wx/simple_video_view.cc | 6 ++++++ src/wx/simple_video_view.h | 2 ++ src/wx/video_view.h | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 9dbb0091a..be555ad91 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -429,7 +429,7 @@ FilmViewer::start () _playing = true; _dropped = 0; - _video_view->timer (); + _video_view->start (); Started (position()); } diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc index 9aa73fe7f..37daecda2 100644 --- a/src/wx/simple_video_view.cc +++ b/src/wx/simple_video_view.cc @@ -163,3 +163,9 @@ SimpleVideoView::timer () _viewer->_butler->rethrow (); } } + +void +SimpleVideoView::start () +{ + timer (); +} diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h index 82c77a4ef..798356cee 100644 --- a/src/wx/simple_video_view.h +++ b/src/wx/simple_video_view.h @@ -38,6 +38,8 @@ public: void update (); + void start (); + private: void paint (); void timer (); diff --git a/src/wx/video_view.h b/src/wx/video_view.h index 8b86b2ba1..dda18058d 100644 --- a/src/wx/video_view.h +++ b/src/wx/video_view.h @@ -44,10 +44,10 @@ public: virtual wxWindow* get () const = 0; virtual void update () = 0; - boost::signals2::signal Sized; + /* XXX_b: make pure */ + virtual void start () {} - /* XXX_b: to remove */ - virtual void timer () {} + boost::signals2::signal Sized; protected: FilmViewer* _viewer; -- 2.30.2