Remove PositionChanged in favour of consumers having their own GUI-thread timers.

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index b173b43ff6c68ac6bc9817414a7cb55baf112eb5..71af4e8cf28f53f7e1a09561616918a04aaf6d43 100644 (file)
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -67,6 +67,7 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
        , _forward_button (new Button (this, wxT(">")))
        , _frame_number (new StaticText (this, wxT("")))
        , _timecode (new StaticText (this, wxT("")))
+       , _timer (this)
 {
        _v_sizer = new wxBoxSizer (wxVERTICAL);
        SetSizer (_v_sizer);
@@ -137,10 +138,12 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
                _jump_to_selected->SetValue (Config::instance()->jump_to_selected ());
        }
 
-       _viewer->PositionChanged.connect (boost::bind(&Controls::position_changed, this));
        _viewer->Started.connect (boost::bind(&Controls::started, this));
        _viewer->Stopped.connect (boost::bind(&Controls::stopped, this));
 
+       Bind (wxEVT_TIMER, boost::bind(&Controls::update_position, this));
+       _timer.Start (80, wxTIMER_CONTINUOUS);
+
        set_film (_viewer->film());
 
        setup_sensitivity ();
@@ -172,7 +175,7 @@ Controls::stopped ()
 }
 
 void
-Controls::position_changed ()
+Controls::update_position ()
 {
        if (!_slider_being_moved) {
                update_position_label ();

diff --git a/src/wx/controls.h b/src/wx/controls.h
index dfa11e6d74ecc67e8526d9f4c8f43760bfe7d4c6..01446445657c40aa5e8597ad47bcf56ac329b30c 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -87,7 +87,7 @@ private:
        void image_changed (boost::weak_ptr<PlayerVideo>);
        void outline_content_changed ();
        void eye_changed ();
-       void position_changed ();
+       void update_position ();
        void film_change (ChangeType, Film::Property);
 
        typedef std::pair<boost::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
@@ -105,6 +105,8 @@ private:
 
        ClosedCaptionsDialog* _closed_captions_dialog;
 
+       wxTimer _timer;
+
        boost::signals2::scoped_connection _film_change_connection;
        boost::signals2::scoped_connection _config_changed_connection;
 };

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index dc6ed10c4d0616fbb6c2bb15e0f40deb093f6a32..5c73f292c83d0548bfc18a2a251526aa98026712 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -256,7 +256,6 @@ FilmViewer::video_view_sized ()
        if (!quick_refresh()) {
                slow_refresh ();
        }
-       PositionChanged ();
 }
 
 void
@@ -380,7 +379,6 @@ FilmViewer::player_change (ChangeType type, int property, bool frequent)
        if (!refreshed) {
                slow_refresh ();
        }
-       PositionChanged ();
 }
 
 void

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index a59468c363579ab8a6d7d92c74c5fe47c2095e4b..6b6aa78f5dd1c3bb4fe5542533e5eb8f12f5a83b 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -141,7 +141,6 @@ public:
        int time_until_next_frame () const;
 
        boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
-       boost::signals2::signal<void ()> PositionChanged;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
        boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;
        /** While playing back we reached the end of the film (emitted from GUI thread) */

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 1e97adb30478eafb9e5b4a39195d41dcb2a8e23d..619a35cce0d80bf6b5a6cbefa3780058e63d255d 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -193,7 +193,6 @@ SimpleVideoView::get (bool lazy)
        }
 
        display_player_video ();
-       _viewer->PositionChanged ();
 
        return true;
 }

diff --git a/src/wx/swaroop_controls.cc b/src/wx/swaroop_controls.cc
index 5ce6c45fc7a637f6e6c1e99124d596f7698cb422..add9bf3e0ae5937f9bbdce005dae8f01212a7501 100644 (file)
--- a/src/wx/swaroop_controls.cc
+++ b/src/wx/swaroop_controls.cc
@@ -54,6 +54,7 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
        , _previous_button (new Button(this, "Previous"))
        , _current_disable_timeline (false)
        , _current_disable_next (false)
+       , _timer (this)
 {
        _button_sizer->Add (_previous_button, 0, wxEXPAND);
        _button_sizer->Add (_play_button, 0, wxEXPAND);
@@ -112,10 +113,13 @@ SwaroopControls::SwaroopControls (wxWindow* parent, shared_ptr<FilmViewer> viewe
        _spl_view->Bind        (wxEVT_LIST_ITEM_SELECTED,   boost::bind(&SwaroopControls::spl_selection_changed, this));
        _spl_view->Bind        (wxEVT_LIST_ITEM_DESELECTED, boost::bind(&SwaroopControls::spl_selection_changed, this));
        _viewer->Finished.connect (boost::bind(&SwaroopControls::viewer_finished, this));
-       _viewer->PositionChanged.connect (boost::bind(&SwaroopControls::viewer_position_changed, this));
        _refresh_spl_view->Bind (wxEVT_BUTTON, boost::bind(&SwaroopControls::update_playlist_directory, this));
        _refresh_content_view->Bind (wxEVT_BUTTON, boost::bind(&ContentView::update, _content_view));
 
+       /* Write position every two minutes if we're playing */
+       Bind (wxEVT_TIMER, boost::bind(&SwaroopControls::write_position, this));
+       _timer.Start (2 * 60 * 1000, wxTIMER_CONTINUOUS);
+
        _content_view->update ();
        update_playlist_directory ();
 
@@ -153,10 +157,9 @@ SwaroopControls::check_restart ()
 }
 
 void
-SwaroopControls::viewer_position_changed ()
+SwaroopControls::write_position ()
 {
-       /* Write position every two minutes if we're playing */
-       if (!_selected_playlist || !_viewer->playing() || _viewer->position().get() % (2 * 60 * DCPTime::HZ)) {
+       if (!_selected_playlist || !_viewer->playing()) {
                return;
        }
 

diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h
index 11dbcfc1013025fbec4329c65f91d702699e41ad..a8bb41dea75d80258fd33fb43f93473c9fb6f284 100644 (file)
--- a/src/wx/swaroop_controls.h
+++ b/src/wx/swaroop_controls.h
@@ -54,7 +54,7 @@ private:
        void setup_sensitivity ();
        void config_changed (int);
        void viewer_finished ();
-       void viewer_position_changed ();
+       void write_position ();
        void reset_film ();
        void update_current_content ();
        bool can_do_previous ();
@@ -84,4 +84,6 @@ private:
        std::vector<SPL> _playlists;
        boost::optional<int> _selected_playlist;
        int _selected_playlist_position;
+
+       wxTimer _timer;
 };

diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index daeeb0a51280916c4bb5b594c59fe86f6627c201..9f71847f5c626dfb7e39690c91010e19d4f54252 100644 (file)
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -82,6 +82,7 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film, w
        , _y_scroll_rate (16)
        , _pixels_per_track (48)
        , _first_resize (true)
+       , _timer (this)
 {
 #ifndef __WXOSX__
        _labels_canvas->SetDoubleBuffered (true);
@@ -116,16 +117,15 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr<Film> film, w
        _film_changed_connection = film->Change.connect (bind (&Timeline::film_change, this, _1, _2));
        _film_content_change_connection = film->ContentChange.connect (bind (&Timeline::film_content_change, this, _1, _3, _4));
 
-       shared_ptr<FilmViewer> vp = viewer.lock ();
-       DCPOMATIC_ASSERT (vp);
-       _viewer_position_change_connection = vp->PositionChanged.connect (bind(&Timeline::position_change, this));
+       Bind (wxEVT_TIMER, boost::bind(&Timeline::update_playhead, this));
+       _timer.Start (200, wxTIMER_CONTINUOUS);
 
        setup_scrollbars ();
        _labels_canvas->ShowScrollbars (wxSHOW_SB_NEVER, wxSHOW_SB_NEVER);
 }
 
 void
-Timeline::position_change ()
+Timeline::update_playhead ()
 {
        Refresh ();
 }

diff --git a/src/wx/timeline.h b/src/wx/timeline.h
index ef887dab8242878563dde77e08dd4a53d32d4caf..44a8973716bdd3dca7f3df7fe761f5fd1a019f40 100644 (file)
--- 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;
 };