Remove temporary access to timer() method.

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 9dbb0091a348270bed8a211d92818f7d11cdf71d..be555ad91f556beb19937d4585408af0d6f44e7d 100644 (file)
--- 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 9aa73fe7ff35d0a7446a93b71e304cffab405f7d..37daecda2be113823ac694c29e5a9845523e6b86 100644 (file)
--- 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 82c77a4efeb91ad2f9d5def42950299a877448b7..798356cee448e30bfe90189478ff16ae36048509 100644 (file)
--- 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 8b86b2ba188da5d50ba4753a080e130bec9c073b..dda18058d4e6a4309aa31ffeed1b58ce87d77d95 100644 (file)
--- 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<void()> Sized;
+       /* XXX_b: make pure */
+       virtual void start () {}
 
-       /* XXX_b: to remove */
-       virtual void timer () {}
+       boost::signals2::signal<void()> Sized;
 
 protected:
        FilmViewer* _viewer;