Basic display of markers above the playback timeline (#1921).

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

diff --git a/src/wx/controls.h b/src/wx/controls.h
index 377960425ba2807e5982ede7f25ffd4ec8e376a5..5f7dc387a252e549c38ecce3f1ca6c3330f624b3 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -24,23 +24,25 @@
 
 
 #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 ClosedCaptionsDialog;
 class Content;
+class ContentView;
+class Film;
+class FilmViewer;
+class MarkersPanel;
 class PlayerVideo;
-class wxToggleButton;
+
 class wxListCtrl;
-class ContentView;
+class wxToggleButton;
 
 
 namespace dcp {
@@ -57,7 +59,6 @@ public:
                bool editor_controls = true
                );
 
-       virtual void log (wxString) {}
        virtual void set_film (std::shared_ptr<Film> film);
 
        virtual void play () {};
@@ -78,6 +79,7 @@ protected:
        wxSizer* _v_sizer;
        wxBoxSizer* _button_sizer;
        std::shared_ptr<Film> _film;
+       MarkersPanel* _markers;
        wxSlider* _slider;
        std::weak_ptr<FilmViewer> _viewer;
        boost::optional<std::string> _active_job;