Dolby is apparently recreating all their certificates (as they will soon expire)...

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

diff --git a/src/wx/controls.h b/src/wx/controls.h
index 0341da29009febe7c8878cdaad1981d787e60d3f..f04f3aab6c60cc27bb4a02d7858131930b16fdb5 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -25,7 +25,6 @@
 
 #include "lib/dcpomatic_time.h"
 #include "lib/film.h"
-#include "lib/types.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
@@ -33,12 +32,15 @@ LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 
+class CheckBox;
 class ClosedCaptionsDialog;
 class Content;
 class ContentView;
 class Film;
 class FilmViewer;
+class MarkersPanel;
 class PlayerVideo;
+
 class wxListCtrl;
 class wxToggleButton;
 
@@ -53,7 +55,7 @@ class Controls : public wxPanel
 public:
        Controls (
                wxWindow* parent,
-               std::shared_ptr<FilmViewer>,
+               FilmViewer &,
                bool editor_controls = true
                );
 
@@ -77,8 +79,9 @@ protected:
        wxSizer* _v_sizer;
        wxBoxSizer* _button_sizer;
        std::shared_ptr<Film> _film;
+       MarkersPanel* _markers;
        wxSlider* _slider;
-       std::weak_ptr<FilmViewer> _viewer;
+       FilmViewer& _viewer;
        boost::optional<std::string> _active_job;
 
 private:
@@ -105,9 +108,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;