X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_appearance_dialog.cc;h=dd8353cf4866dc298992d5ba4a90c50fde561fd7;hb=9c1bb2e5ca7c80c4e26b1b2e41159aa171360a94;hp=8ae99bc73afa4092063780ea10384144ead40eb5;hpb=66ce3b83877b3d7b95f6cd424fc9516e0bf79aa9;p=dcpomatic.git diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc index 8ae99bc73..dd8353cf4 100644 --- a/src/wx/subtitle_appearance_dialog.cc +++ b/src/wx/subtitle_appearance_dialog.cc @@ -20,8 +20,10 @@ #include "subtitle_appearance_dialog.h" #include "rgba_colour_picker.h" -#include "lib/text_subtitle_content.h" -#include "lib/subtitle_content.h" +#include "static_text.h" +#include "check_box.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 @@ -39,9 +41,11 @@ int const SubtitleAppearanceDialog::NONE = 0; int const SubtitleAppearanceDialog::OUTLINE = 1; int const SubtitleAppearanceDialog::SHADOW = 2; -SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr content) - : wxDialog (parent, wxID_ANY, _("Subtitle appearance")) +SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr film, shared_ptr content, shared_ptr caption) + : wxDialog (parent, wxID_ANY, _("Caption appearance")) + , _film (film) , _content (content) + , _caption (caption) { shared_ptr ff = dynamic_pointer_cast (content); if (ff) { @@ -88,10 +92,10 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr map colours = _stream->colours (); - wxStaticText* t = new wxStaticText (colours_panel, wxID_ANY, ""); + wxStaticText* t = new StaticText (colours_panel, ""); t->SetLabelMarkup (_("Original colour")); 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 (_("New colour")); table->Add (t, 1, wxALIGN_CENTER); @@ -126,7 +130,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _effect->Append (_("Outline")); _effect->Append (_("Shadow"));; - optional colour = _content->subtitle->colour(); + optional colour = _caption->colour(); _force_colour->SetValue (static_cast(colour)); if (colour) { _colour->SetColour (wxColour (colour->r, colour->g, colour->b)); @@ -134,7 +138,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _colour->SetColour (wxColour (255, 255, 255)); } - optional effect = _content->subtitle->effect(); + optional effect = _caption->effect(); _force_effect->SetValue (static_cast(effect)); if (effect) { switch (*effect) { @@ -152,7 +156,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _effect->SetSelection (NONE); } - optional effect_colour = _content->subtitle->effect_colour(); + optional effect_colour = _caption->effect_colour(); _force_effect_colour->SetValue (static_cast(effect_colour)); if (effect_colour) { _effect_colour->SetColour (wxColour (effect_colour->r, effect_colour->g, effect_colour->b)); @@ -160,23 +164,23 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _effect_colour->SetColour (wxColour (0, 0, 0)); } - optional fade_in = _content->subtitle->fade_in(); + optional fade_in = _caption->fade_in(); _force_fade_in->SetValue (static_cast(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 fade_out = _content->subtitle->fade_out(); + optional fade_out = _caption->fade_out(); _force_fade_out->SetValue (static_cast(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->subtitle->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 +188,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,40 +216,46 @@ SubtitleAppearanceDialog::set_to (wxWindow* w, int& r) void SubtitleAppearanceDialog::apply () { + shared_ptr film = _film.lock (); + if (_force_colour->GetValue ()) { wxColour const c = _colour->GetColour (); - _content->subtitle->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue())); + _caption->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue())); } else { - _content->subtitle->unset_colour (); + _caption->unset_colour (); } - switch (_effect->GetSelection()) { - case NONE: - _content->subtitle->set_effect (dcp::NONE); - break; - case OUTLINE: - _content->subtitle->set_effect (dcp::BORDER); - break; - case SHADOW: - _content->subtitle->set_effect (dcp::SHADOW); - break; + if (_force_effect->GetValue()) { + switch (_effect->GetSelection()) { + case NONE: + _caption->set_effect (dcp::NONE); + break; + case OUTLINE: + _caption->set_effect (dcp::BORDER); + break; + case SHADOW: + _caption->set_effect (dcp::SHADOW); + break; + } + } else { + _caption->unset_effect (); } if (_force_effect_colour->GetValue ()) { wxColour const ec = _effect_colour->GetColour (); - _content->subtitle->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->subtitle->unset_effect_colour (); + _caption->unset_effect_colour (); } if (_force_fade_in->GetValue ()) { - _content->subtitle->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->subtitle->unset_fade_in (); + _caption->unset_fade_in (); } if (_force_fade_out->GetValue ()) { - _content->subtitle->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->subtitle->unset_fade_out (); + _caption->unset_fade_out (); } - _content->subtitle->set_outline_width (_outline_width->GetValue ()); + _caption->set_outline_width (_outline_width->GetValue ()); if (_stream) { for (map::const_iterator i = _pickers.begin(); i != _pickers.end(); ++i) { @@ -268,11 +286,11 @@ 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->subtitle->burn (); + bool const can_outline_width = _effect->GetSelection() == OUTLINE && _caption->burn (); _outline_width->Enable (can_outline_width); if (can_outline_width) { _outline_width->UnsetToolTip (); } else { - _outline_width->SetToolTip (_("Outline width cannot be set unless you are burning in subtitles")); + _outline_width->SetToolTip (_("Outline width cannot be set unless you are burning in captions")); } }