Hide warnings triggered by Ubuntu 20.04's gcc.

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

diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index d02e283d90a8d80e06eba09e6ee1ac1919fa42e7..b0dd8d30723775a852eb66234e7f25968c382e28 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -20,7 +20,10 @@
 
 #include "timecode.h"
 #include "lib/rgba.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/shared_ptr.hpp>
 #include <boost/signals2.hpp>
 
@@ -33,6 +36,7 @@ class FFmpegSubtitleStream;
 class wxCheckBox;
 class wxWidget;
 class Film;
+class Job;
 
 class SubtitleAppearanceDialog : public wxDialog
 {
@@ -46,6 +50,8 @@ private:
        void restore ();
        wxCheckBox* set_to (wxWindow* w, int& r);
        void content_change (ChangeType type);
+       void active_jobs_changed (boost::optional<std::string> last);
+       void add_colours ();
 
        boost::weak_ptr<const Film> _film;
        wxCheckBox* _force_colour;
@@ -55,18 +61,26 @@ private:
        wxCheckBox* _force_effect_colour;
        wxColourPickerCtrl* _effect_colour;
        wxCheckBox* _force_fade_in;
-       Timecode<ContentTime>* _fade_in;
+       Timecode<dcpomatic::ContentTime>* _fade_in;
        wxCheckBox* _force_fade_out;
-       Timecode<ContentTime>* _fade_out;
+       Timecode<dcpomatic::ContentTime>* _fade_out;
        wxSpinCtrl* _outline_width;
        wxGridBagSizer* _table;
        std::map<RGBA, RGBAColourPicker*> _pickers;
 
+       wxBoxSizer* _overall_sizer;
+       wxScrolled<wxPanel>* _colours_panel;
+       wxStaticText* _finding;
+       wxFlexGridSizer* _colour_table;
+
        boost::shared_ptr<Content> _content;
        boost::shared_ptr<TextContent> _caption;
        boost::shared_ptr<FFmpegSubtitleStream> _stream;
 
        boost::signals2::scoped_connection _content_connection;
+       boost::signals2::scoped_connection _job_manager_connection;
+
+       boost::weak_ptr<Job> _job;
 
        static int const NONE;
        static int const OUTLINE;