Merge a set of changes which run the OpenGL video updates in a separate

[dcpomatic.git] / src / wx / swaroop_controls.h

diff --git a/src/wx/swaroop_controls.h b/src/wx/swaroop_controls.h
index d8d39d4a0153d4292f1e2c4838e99936992116de..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 ();
@@ -77,7 +77,6 @@ private:
        wxListCtrl* _spl_view;
        wxButton* _refresh_spl_view;
        wxListCtrl* _current_spl_view;
-       wxTextCtrl* _log;
 
        bool _current_disable_timeline;
        bool _current_disable_next;
@@ -85,4 +84,6 @@ private:
        std::vector<SPL> _playlists;
        boost::optional<int> _selected_playlist;
        int _selected_playlist_position;
+
+       wxTimer _timer;
 };