Fix markup in fr_FR translation causing missing text in disk writer (#2492).

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

diff --git a/src/wx/controls.h b/src/wx/controls.h
index ca9c2008759c0ad9b7a8609d41982e0f74e32b37..321d7e05c0868fa1083135d443f82160dd90590b 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 <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,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:
@@ -103,11 +106,11 @@ private:
 
        typedef std::pair<std::shared_ptr<dcp::CPL>, boost::filesystem::path> CPL;
 
-       bool _slider_being_moved;
+       bool _slider_being_moved = false;
 
-       wxCheckBox* _outline_content;
-       wxChoice* _eye;
-       wxCheckBox* _jump_to_selected;
+       CheckBox* _outline_content = nullptr;
+       wxChoice* _eye = nullptr;
+       CheckBox* _jump_to_selected = nullptr;
        wxButton* _rewind_button;
        wxButton* _back_button;
        wxButton* _forward_button;