Merge a set of changes which run the OpenGL video updates in a separatev2.15.40

thread, hopefully making things more elegant and robust.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/wx/controls.h b/src/wx/controls.h
index dfa11e6d7..1b6a379cc 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -53,6 +53,11 @@ public:
 
 	virtual void log (wxString) {}
 	virtual void set_film (boost::shared_ptr<Film> film);
+#ifdef DCPOMATIC_PLAYER_STRESS_TEST
+	virtual void play () {};
+	virtual void stop () {};
+	void seek (int slider);
+#endif
 	boost::shared_ptr<Film> film () const;
 	void back_frame ();
 	void forward_frame ();
@@ -87,7 +92,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 +110,8 @@ private:
 
 	ClosedCaptionsDialog* _closed_captions_dialog;
 
+	wxTimer _timer;
+
 	boost::signals2::scoped_connection _film_change_connection;
 	boost::signals2::scoped_connection _config_changed_connection;
 };