X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_appearance_dialog.cc;h=69a7d743d3b6b2e38c2b51d3354d88e2d3770290;hb=fe33a32911969530aed75bc2a87b7a7cd2c05be6;hp=c0a6a0df6fce3241c8b84a51cfa404c6cf888330;hpb=27b83475435dda4e84a90cf59a52f150905c4ab1;p=dcpomatic.git

diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc
index c0a6a0df6..69a7d743d 100644
--- a/src/wx/subtitle_appearance_dialog.cc
+++ b/src/wx/subtitle_appearance_dialog.cc
@@ -20,8 +20,11 @@
 
 #include "subtitle_appearance_dialog.h"
 #include "rgba_colour_picker.h"
-#include "lib/text_caption_file_content.h"
-#include "lib/caption_content.h"
+#include "static_text.h"
+#include "check_box.h"
+#include "dcpomatic_button.h"
+#include "lib/string_text_file_content.h"
+#include "lib/text_content.h"
 #include "lib/ffmpeg_subtitle_stream.h"
 #include "lib/ffmpeg_content.h"
 #include <wx/wx.h>
@@ -39,9 +42,11 @@ int const SubtitleAppearanceDialog::NONE = 0;
 int const SubtitleAppearanceDialog::OUTLINE = 1;
 int const SubtitleAppearanceDialog::SHADOW = 2;
 
-SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr<Content> content)
-	: wxDialog (parent, wxID_ANY, _("Subtitle appearance"))
+SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr<const Film> film, shared_ptr<Content> content, shared_ptr<TextContent> caption)
+	: wxDialog (parent, wxID_ANY, _("Caption appearance"))
+	, _film (film)
 	, _content (content)
+	, _caption (caption)
 {
 	shared_ptr<FFmpegContent> ff = dynamic_pointer_cast<FFmpegContent> (content);
 	if (ff) {
@@ -88,10 +93,10 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 
 		map<RGBA, RGBA> colours = _stream->colours ();
 
-		wxStaticText* t = new wxStaticText (colours_panel, wxID_ANY, "");
+		wxStaticText* t = new StaticText (colours_panel, "");
 		t->SetLabelMarkup (_("<b>Original colour</b>"));
 		table->Add (t, 1, wxEXPAND);
-		t = new wxStaticText (colours_panel, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL);
+		t = new StaticText (colours_panel, "", wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE_HORIZONTAL);
 		t->SetLabelMarkup (_("<b>New colour</b>"));
 		table->Add (t, 1, wxALIGN_CENTER);
 
@@ -108,7 +113,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 
 		overall_sizer->Add (colours_panel, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
-		wxButton* restore = new wxButton (this, wxID_ANY, _("Restore to original colours"));
+		wxButton* restore = new Button (this, _("Restore to original colours"));
 		restore->Bind (wxEVT_BUTTON, bind (&SubtitleAppearanceDialog::restore, this));
 		overall_sizer->Add (restore, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
 	}
@@ -126,7 +131,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 	_effect->Append (_("Outline"));
 	_effect->Append (_("Shadow"));;
 
-	optional<dcp::Colour> colour = _content->caption->colour();
+	optional<dcp::Colour> colour = _caption->colour();
 	_force_colour->SetValue (static_cast<bool>(colour));
 	if (colour) {
 		_colour->SetColour (wxColour (colour->r, colour->g, colour->b));
@@ -134,7 +139,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 		_colour->SetColour (wxColour (255, 255, 255));
 	}
 
-	optional<dcp::Effect> effect = _content->caption->effect();
+	optional<dcp::Effect> effect = _caption->effect();
 	_force_effect->SetValue (static_cast<bool>(effect));
 	if (effect) {
 		switch (*effect) {
@@ -152,7 +157,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 		_effect->SetSelection (NONE);
 	}
 
-	optional<dcp::Colour> effect_colour = _content->caption->effect_colour();
+	optional<dcp::Colour> effect_colour = _caption->effect_colour();
 	_force_effect_colour->SetValue (static_cast<bool>(effect_colour));
 	if (effect_colour) {
 		_effect_colour->SetColour (wxColour (effect_colour->r, effect_colour->g, effect_colour->b));
@@ -160,23 +165,23 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 		_effect_colour->SetColour (wxColour (0, 0, 0));
 	}
 
-	optional<ContentTime> fade_in = _content->caption->fade_in();
+	optional<ContentTime> fade_in = _caption->fade_in();
 	_force_fade_in->SetValue (static_cast<bool>(fade_in));
 	if (fade_in) {
-		_fade_in->set (*fade_in, _content->active_video_frame_rate());
+		_fade_in->set (*fade_in, _content->active_video_frame_rate(film));
 	} else {
-		_fade_in->set (ContentTime(), _content->active_video_frame_rate());
+		_fade_in->set (ContentTime(), _content->active_video_frame_rate(film));
 	}
 
-	optional<ContentTime> fade_out = _content->caption->fade_out();
+	optional<ContentTime> fade_out = _caption->fade_out();
 	_force_fade_out->SetValue (static_cast<bool>(fade_out));
 	if (fade_out) {
-		_fade_out->set (*fade_out, _content->active_video_frame_rate ());
+		_fade_out->set (*fade_out, _content->active_video_frame_rate(film));
 	} else {
-		_fade_out->set (ContentTime(), _content->active_video_frame_rate ());
+		_fade_out->set (ContentTime(), _content->active_video_frame_rate(film));
 	}
 
-	_outline_width->SetValue (_content->caption->outline_width ());
+	_outline_width->SetValue (_caption->outline_width ());
 
 	_force_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
 	_force_effect_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
@@ -184,16 +189,24 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr
 	_force_fade_in->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
 	_force_fade_out->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
 	_effect->Bind (wxEVT_CHOICE, bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
-	_content_connection = _content->Changed.connect (bind (&SubtitleAppearanceDialog::setup_sensitivity, this));
+	_content_connection = _content->Change.connect (bind (&SubtitleAppearanceDialog::content_change, this, _1));
 
 	setup_sensitivity ();
 }
 
+void
+SubtitleAppearanceDialog::content_change (ChangeType type)
+{
+	if (type == CHANGE_TYPE_DONE) {
+		setup_sensitivity ();
+	}
+}
+
 wxCheckBox*
 SubtitleAppearanceDialog::set_to (wxWindow* w, int& r)
 {
 	wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
-	wxCheckBox* set_to = new wxCheckBox (this, wxID_ANY, _("Set to"));
+	wxCheckBox* set_to = new CheckBox (this, _("Set to"));
 	s->Add (set_to, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, 8);
 	s->Add (w, 0, wxALIGN_CENTER_VERTICAL);
 	_table->Add (s, wxGBPosition (r, 1));
@@ -204,44 +217,46 @@ SubtitleAppearanceDialog::set_to (wxWindow* w, int& r)
 void
 SubtitleAppearanceDialog::apply ()
 {
+	shared_ptr<const Film> film = _film.lock ();
+
 	if (_force_colour->GetValue ()) {
 		wxColour const c = _colour->GetColour ();
-		_content->caption->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
+		_caption->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue()));
 	} else {
-		_content->caption->unset_colour ();
+		_caption->unset_colour ();
 	}
 	if (_force_effect->GetValue()) {
 		switch (_effect->GetSelection()) {
 		case NONE:
-			_content->caption->set_effect (dcp::NONE);
+			_caption->set_effect (dcp::NONE);
 			break;
 		case OUTLINE:
-			_content->caption->set_effect (dcp::BORDER);
+			_caption->set_effect (dcp::BORDER);
 			break;
 		case SHADOW:
-			_content->caption->set_effect (dcp::SHADOW);
+			_caption->set_effect (dcp::SHADOW);
 			break;
 		}
 	} else {
-		_content->caption->unset_effect ();
+		_caption->unset_effect ();
 	}
 	if (_force_effect_colour->GetValue ()) {
 		wxColour const ec = _effect_colour->GetColour ();
-		_content->caption->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue()));
+		_caption->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue()));
 	} else {
-		_content->caption->unset_effect_colour ();
+		_caption->unset_effect_colour ();
 	}
 	if (_force_fade_in->GetValue ()) {
-		_content->caption->set_fade_in (_fade_in->get (_content->active_video_frame_rate ()));
+		_caption->set_fade_in (_fade_in->get(_content->active_video_frame_rate(film)));
 	} else {
-		_content->caption->unset_fade_in ();
+		_caption->unset_fade_in ();
 	}
 	if (_force_fade_out->GetValue ()) {
-		_content->caption->set_fade_out (_fade_out->get (_content->active_video_frame_rate ()));
+		_caption->set_fade_out (_fade_out->get(_content->active_video_frame_rate(film)));
 	} else {
-		_content->caption->unset_fade_out ();
+		_caption->unset_fade_out ();
 	}
-	_content->caption->set_outline_width (_outline_width->GetValue ());
+	_caption->set_outline_width (_outline_width->GetValue ());
 
 	if (_stream) {
 		for (map<RGBA, RGBAColourPicker*>::const_iterator i = _pickers.begin(); i != _pickers.end(); ++i) {
@@ -272,7 +287,7 @@ SubtitleAppearanceDialog::setup_sensitivity ()
 	_fade_in->Enable (_force_fade_in->GetValue ());
 	_fade_out->Enable (_force_fade_out->GetValue ());
 
-	bool const can_outline_width = _effect->GetSelection() == OUTLINE && _content->caption->burn ();
+	bool const can_outline_width = _effect->GetSelection() == OUTLINE && _caption->burn ();
 	_outline_width->Enable (can_outline_width);
 	if (can_outline_width) {
 		_outline_width->UnsetToolTip ();