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

diff --git a/src/wx/controls.h b/src/wx/controls.h
index 9a22d7709..df33005ff 100644
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -24,23 +24,26 @@
 
 
 #include "lib/dcpomatic_time.h"
-#include "lib/types.h"
 #include "lib/film.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include "lib/types.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
-class FilmViewer;
-class Film;
+class CheckBox;
 class ClosedCaptionsDialog;
 class Content;
+class ContentView;
+class Film;
+class FilmViewer;
+class MarkersPanel;
 class PlayerVideo;
-class wxToggleButton;
+
 class wxListCtrl;
-class ContentView;
+class wxToggleButton;
 
 
 namespace dcp {
@@ -53,11 +56,10 @@ class Controls : public wxPanel
 public:
 	Controls (
 		wxWindow* parent,
-		std::shared_ptr<FilmViewer>,
+		FilmViewer &,
 		bool editor_controls = true
 		);
 
-	virtual void log (wxString) {}
 	virtual void set_film (std::shared_ptr<Film> film);
 
 	virtual void play () {};
@@ -78,8 +80,9 @@ protected:
 	wxSizer* _v_sizer;
 	wxBoxSizer* _button_sizer;
 	std::shared_ptr<Film> _film;
+	MarkersPanel* _markers;
 	wxSlider* _slider;
-	std::shared_ptr<FilmViewer> _viewer;
+	FilmViewer& _viewer;
 	boost::optional<std::string> _active_job;
 
 private:
@@ -106,9 +109,9 @@ private:
 
 	bool _slider_being_moved;
 
-	wxCheckBox* _outline_content;
+	CheckBox* _outline_content;
 	wxChoice* _eye;
-	wxCheckBox* _jump_to_selected;
+	CheckBox* _jump_to_selected;
 	wxButton* _rewind_button;
 	wxButton* _back_button;
 	wxButton* _forward_button;