Basic release notes support (#2282).
[dcpomatic.git] / src / wx / controls.h
index ca9c2008759c0ad9b7a8609d41982e0f74e32b37..5f7dc387a252e549c38ecce3f1ca6c3330f624b3 100644 (file)
 
 
 #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 {
@@ -77,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;