X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.h;h=75bae9bb3877635f50e02f27aa67fdb48baca83f;hb=HEAD;hp=df33005ff11a39a12b831ba6c19f9b6f29326d68;hpb=b39dbb7cf1b0352cf0eb3af4bf4929556355bff5;p=dcpomatic.git

diff --git a/src/wx/controls.h b/src/wx/controls.h
index df33005ff..75bae9bb3 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -23,9 +23,9 @@
 #define DCPOMATIC_CONTROLS_H
 
 
+#include "lib/change_signaller.h"
 #include "lib/dcpomatic_time.h"
-#include "lib/film.h"
-#include "lib/types.h"
+#include "lib/film_property.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
@@ -60,7 +60,7 @@ public:
 		bool editor_controls = true
 		);
 
-	virtual void set_film (std::shared_ptr<Film> film);
+	void set_film (std::shared_ptr<Film> film);
 
 	virtual void play () {};
 	virtual void stop () {};
@@ -103,15 +103,15 @@ private:
 	void outline_content_changed ();
 	void eye_changed ();
 	void update_position ();
-	void film_change (ChangeType, Film::Property);
+	void film_change(ChangeType, FilmProperty);
 
 	typedef std::pair<std::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
 
-	bool _slider_being_moved;
+	bool _slider_being_moved = false;
 
-	CheckBox* _outline_content;
-	wxChoice* _eye;
-	CheckBox* _jump_to_selected;
+	CheckBox* _outline_content = nullptr;
+	wxChoice* _eye = nullptr;
+	CheckBox* _jump_to_selected = nullptr;
 	wxButton* _rewind_button;
 	wxButton* _back_button;
 	wxButton* _forward_button;