Fix floating line at the top of the groups column.

[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 ed0360e4c281ba95c021cfbee731e1ef75b0fce1..daaccf08f86aa4251429ac318d89bf9e66c99cc4 100644 (file)
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -19,9 +19,12 @@
 */
 
 #include "timecode.h"
+#include "lib/change_signaller.h"
 #include "lib/rgba.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
-#include <boost/shared_ptr.hpp>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
 class wxRadioButton;
@@ -33,11 +36,12 @@ class FFmpegSubtitleStream;
 class wxCheckBox;
 class wxWidget;
 class Film;
+class Job;
 
 class SubtitleAppearanceDialog : public wxDialog
 {
 public:
-       SubtitleAppearanceDialog (wxWindow* parent, boost::shared_ptr<const Film> film, boost::shared_ptr<Content> content, boost::shared_ptr<TextContent> caption);
+       SubtitleAppearanceDialog (wxWindow* parent, std::shared_ptr<const Film> film, std::shared_ptr<Content> content, std::shared_ptr<TextContent> caption);
 
        void apply ();
 
@@ -49,7 +53,7 @@ private:
        void active_jobs_changed (boost::optional<std::string> last);
        void add_colours ();
 
-       boost::weak_ptr<const Film> _film;
+       std::weak_ptr<const Film> _film;
        wxCheckBox* _force_colour;
        wxColourPickerCtrl* _colour;
        wxCheckBox* _force_effect;
@@ -57,9 +61,9 @@ 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;
@@ -69,13 +73,15 @@ private:
        wxStaticText* _finding;
        wxFlexGridSizer* _colour_table;
 
-       boost::shared_ptr<Content> _content;
-       boost::shared_ptr<TextContent> _caption;
-       boost::shared_ptr<FFmpegSubtitleStream> _stream;
+       std::shared_ptr<Content> _content;
+       std::shared_ptr<TextContent> _caption;
+       std::shared_ptr<FFmpegSubtitleStream> _stream;
 
        boost::signals2::scoped_connection _content_connection;
        boost::signals2::scoped_connection _job_manager_connection;
 
+       std::weak_ptr<Job> _job;
+
        static int const NONE;
        static int const OUTLINE;
        static int const SHADOW;