X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_appearance_dialog.h;h=cef264590343dfe97ecd3c294d30b839826e3bd3;hb=45bc91b9a909035252ee10afe4fed2eef996e4ed;hp=b0dd8d30723775a852eb66234e7f25968c382e28;hpb=2da4caba7871455c097c0ed940dd6f2332dbda5d;p=dcpomatic.git

diff --git a/src/wx/subtitle_appearance_dialog.h b/src/wx/subtitle_appearance_dialog.h
index b0dd8d307..cef264590 100644
--- a/src/wx/subtitle_appearance_dialog.h
+++ b/src/wx/subtitle_appearance_dialog.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,51 +18,54 @@
 
 */
 
+
 #include "timecode.h"
+#include "lib/change_signaller.h"
 #include "lib/rgba.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
 
-class wxRadioButton;
-class wxColourPickerCtrl;
-class wxGridBagSizer;
+
+class CheckBox;
 class Content;
-class RGBAColourPicker;
 class FFmpegSubtitleStream;
-class wxCheckBox;
-class wxWidget;
 class Film;
 class Job;
+class RGBAColourPicker;
+class wxColourPickerCtrl;
+class wxGridBagSizer;
+class wxRadioButton;
+class wxWidget;
+
 
 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 ();
 
 private:
 	void setup_sensitivity ();
 	void restore ();
-	wxCheckBox* set_to (wxWindow* w, int& r);
+	CheckBox* 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;
+	std::weak_ptr<const Film> _film;
+	CheckBox* _force_colour;
 	wxColourPickerCtrl* _colour;
-	wxCheckBox* _force_effect;
+	CheckBox* _force_effect;
 	wxChoice* _effect;
-	wxCheckBox* _force_effect_colour;
+	CheckBox* _force_effect_colour;
 	wxColourPickerCtrl* _effect_colour;
-	wxCheckBox* _force_fade_in;
+	CheckBox* _force_fade_in;
 	Timecode<dcpomatic::ContentTime>* _fade_in;
-	wxCheckBox* _force_fade_out;
+	CheckBox* _force_fade_out;
 	Timecode<dcpomatic::ContentTime>* _fade_out;
 	wxSpinCtrl* _outline_width;
 	wxGridBagSizer* _table;
@@ -70,17 +73,17 @@ private:
 
 	wxBoxSizer* _overall_sizer;
 	wxScrolled<wxPanel>* _colours_panel;
-	wxStaticText* _finding;
+	wxStaticText* _finding = nullptr;
 	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> _text;
+	std::shared_ptr<FFmpegSubtitleStream> _stream;
 
 	boost::signals2::scoped_connection _content_connection;
 	boost::signals2::scoped_connection _job_manager_connection;
 
-	boost::weak_ptr<Job> _job;
+	std::weak_ptr<Job> _job;
 
 	static int const NONE;
 	static int const OUTLINE;