Basic release notes support (#2282).

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

diff --git a/src/wx/controls.h b/src/wx/controls.h
index a2c80b8090bdd9c9d30e700bea47eeef89a4e8aa..5f7dc387a252e549c38ecce3f1ca6c3330f624b3 100644 (file)
--- a/src/wx/controls.h
+++ b/src/wx/controls.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,31 +18,38 @@
 
 */
 
+
 #ifndef DCPOMATIC_CONTROLS_H
 #define DCPOMATIC_CONTROLS_H
 
+
 #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 {
        class CPL;
 }
 
+
 class Controls : public wxPanel
 {
 public:
@@ -52,7 +59,6 @@ public:
                bool editor_controls = true
                );
 
-       virtual void log (wxString) {}
        virtual void set_film (std::shared_ptr<Film> film);
 
        virtual void play () {};
@@ -64,6 +70,7 @@ public:
        void forward_frame ();
 
 protected:
+
        virtual void started ();
        virtual void stopped ();
        virtual void setup_sensitivity ();
@@ -72,8 +79,9 @@ protected:
        wxSizer* _v_sizer;
        wxBoxSizer* _button_sizer;
        std::shared_ptr<Film> _film;
+       MarkersPanel* _markers;
        wxSlider* _slider;
-       std::shared_ptr<FilmViewer> _viewer;
+       std::weak_ptr<FilmViewer> _viewer;
        boost::optional<std::string> _active_job;
 
 private:
@@ -117,4 +125,5 @@ private:
        boost::signals2::scoped_connection _config_changed_connection;
 };
 
+
 #endif