X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_appearance_dialog.cc;h=b5ab8c2db79777f9ab8bee2230782917c104442d;hb=23aa3071850761144798112a5aaea61304de8586;hp=ad4c038503b1e25567e0baa8b8a03a49ef334284;hpb=3ae7939b8926df0fd767db294e5f7a8b07f43ba1;p=dcpomatic.git diff --git a/src/wx/subtitle_appearance_dialog.cc b/src/wx/subtitle_appearance_dialog.cc index ad4c03850..b5ab8c2db 100644 --- a/src/wx/subtitle_appearance_dialog.cc +++ b/src/wx/subtitle_appearance_dialog.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2018 Carl Hetherington + Copyright (C) 2015-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "subtitle_appearance_dialog.h" #include "rgba_colour_picker.h" #include "static_text.h" @@ -29,30 +30,39 @@ #include "lib/ffmpeg_content.h" #include "lib/examine_ffmpeg_subtitles_job.h" #include "lib/job_manager.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include #include #include #include +DCPOMATIC_ENABLE_WARNINGS + using std::map; using std::string; -using boost::shared_ptr; +using std::shared_ptr; using boost::bind; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using boost::optional; +using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + int const SubtitleAppearanceDialog::NONE = 0; int const SubtitleAppearanceDialog::OUTLINE = 1; int const SubtitleAppearanceDialog::SHADOW = 2; -SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr film, shared_ptr content, shared_ptr caption) - : wxDialog (parent, wxID_ANY, _("Caption appearance")) + +SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr film, shared_ptr content, shared_ptr text) + : wxDialog (parent, wxID_ANY, _("Subtitle appearance")) , _film (film) - , _finding (0) , _content (content) - , _caption (caption) + , _text (text) { - shared_ptr ff = dynamic_pointer_cast (content); + auto ff = dynamic_pointer_cast (content); if (ff) { _stream = ff->subtitle_stream (); /* XXX: assuming that all FFmpeg streams have bitmap subs */ @@ -71,24 +81,24 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr int r = 0; - add_label_to_sizer (_table, this, _("Colour"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_table, this, _("Colour"), true, wxGBPosition(r, 0)); _force_colour = set_to (_colour = new wxColourPickerCtrl (this, wxID_ANY), r); - add_label_to_sizer (_table, this, _("Effect"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_table, this, _("Effect"), true, wxGBPosition(r, 0)); _force_effect = set_to (_effect = new wxChoice (this, wxID_ANY), r); - add_label_to_sizer (_table, this, _("Effect colour"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_table, this, _("Effect colour"), true, wxGBPosition(r, 0)); _force_effect_colour = set_to (_effect_colour = new wxColourPickerCtrl (this, wxID_ANY), r); - add_label_to_sizer (_table, this, _("Outline width"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_table, this, _("Outline width"), true, wxGBPosition(r, 0)); _outline_width = new wxSpinCtrl (this, wxID_ANY); - _table->Add (_outline_width, wxGBPosition (r, 1)); + _table->Add (_outline_width, wxGBPosition(r, 1)); ++r; - add_label_to_sizer (_table, this, _("Fade in time"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_table, this, _("Fade in time"), true, wxGBPosition(r, 0)); _force_fade_in = set_to (_fade_in = new Timecode (this), r); - add_label_to_sizer (_table, this, _("Fade out time"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_table, this, _("Fade out time"), true, wxGBPosition(r, 0)); _force_fade_out = set_to (_fade_out = new Timecode (this), r); if (_stream) { @@ -128,7 +138,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _overall_sizer->Add (restore, 0, wxALL, DCPOMATIC_SIZER_X_GAP); } - wxSizer* buttons = CreateSeparatedButtonSizer (wxOK); + auto buttons = CreateSeparatedButtonSizer (wxOK); if (buttons) { _overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } @@ -141,7 +151,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _effect->Append (_("Outline")); _effect->Append (_("Shadow"));; - optional colour = _caption->colour(); + auto colour = _text->colour(); _force_colour->SetValue (static_cast(colour)); if (colour) { _colour->SetColour (wxColour (colour->r, colour->g, colour->b)); @@ -149,17 +159,17 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _colour->SetColour (wxColour (255, 255, 255)); } - optional effect = _caption->effect(); + auto effect = _text->effect(); _force_effect->SetValue (static_cast(effect)); if (effect) { switch (*effect) { - case dcp::NONE: + case dcp::Effect::NONE: _effect->SetSelection (NONE); break; - case dcp::BORDER: + case dcp::Effect::BORDER: _effect->SetSelection (OUTLINE); break; - case dcp::SHADOW: + case dcp::Effect::SHADOW: _effect->SetSelection (SHADOW); break; } @@ -167,7 +177,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _effect->SetSelection (NONE); } - optional effect_colour = _caption->effect_colour(); + auto effect_colour = _text->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)); @@ -175,7 +185,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _effect_colour->SetColour (wxColour (0, 0, 0)); } - optional fade_in = _caption->fade_in(); + auto fade_in = _text->fade_in(); _force_fade_in->SetValue (static_cast(fade_in)); if (fade_in) { _fade_in->set (*fade_in, _content->active_video_frame_rate(film)); @@ -183,7 +193,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _fade_in->set (ContentTime(), _content->active_video_frame_rate(film)); } - optional fade_out = _caption->fade_out(); + auto fade_out = _text->fade_out(); _force_fade_out->SetValue (static_cast(fade_out)); if (fade_out) { _fade_out->set (*fade_out, _content->active_video_frame_rate(film)); @@ -191,7 +201,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr _fade_out->set (ContentTime(), _content->active_video_frame_rate(film)); } - _outline_width->SetValue (_caption->outline_width ()); + _outline_width->SetValue (_text->outline_width ()); _force_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); _force_effect_colour->Bind (wxEVT_CHECKBOX, bind (&SubtitleAppearanceDialog::setup_sensitivity, this)); @@ -207,7 +217,7 @@ SubtitleAppearanceDialog::SubtitleAppearanceDialog (wxWindow* parent, shared_ptr void SubtitleAppearanceDialog::content_change (ChangeType type) { - if (type == CHANGE_TYPE_DONE) { + if (type == ChangeType::DONE) { setup_sensitivity (); } } @@ -215,11 +225,11 @@ SubtitleAppearanceDialog::content_change (ChangeType type) wxCheckBox* SubtitleAppearanceDialog::set_to (wxWindow* w, int& r) { - wxSizer* s = new wxBoxSizer (wxHORIZONTAL); - wxCheckBox* set_to = new CheckBox (this, _("Set to")); + auto s = new wxBoxSizer (wxHORIZONTAL); + auto 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)); + _table->Add (s, wxGBPosition(r, 1)); ++r; return set_to; } @@ -227,54 +237,54 @@ SubtitleAppearanceDialog::set_to (wxWindow* w, int& r) void SubtitleAppearanceDialog::apply () { - shared_ptr film = _film.lock (); + auto film = _film.lock (); if (_force_colour->GetValue ()) { - wxColour const c = _colour->GetColour (); - _caption->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue())); + auto const c = _colour->GetColour (); + _text->set_colour (dcp::Colour (c.Red(), c.Green(), c.Blue())); } else { - _caption->unset_colour (); + _text->unset_colour (); } if (_force_effect->GetValue()) { switch (_effect->GetSelection()) { case NONE: - _caption->set_effect (dcp::NONE); + _text->set_effect (dcp::Effect::NONE); break; case OUTLINE: - _caption->set_effect (dcp::BORDER); + _text->set_effect (dcp::Effect::BORDER); break; case SHADOW: - _caption->set_effect (dcp::SHADOW); + _text->set_effect (dcp::Effect::SHADOW); break; } } else { - _caption->unset_effect (); + _text->unset_effect (); } if (_force_effect_colour->GetValue ()) { - wxColour const ec = _effect_colour->GetColour (); - _caption->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue())); + auto const ec = _effect_colour->GetColour (); + _text->set_effect_colour (dcp::Colour (ec.Red(), ec.Green(), ec.Blue())); } else { - _caption->unset_effect_colour (); + _text->unset_effect_colour (); } if (_force_fade_in->GetValue ()) { - _caption->set_fade_in (_fade_in->get(_content->active_video_frame_rate(film))); + _text->set_fade_in (_fade_in->get(_content->active_video_frame_rate(film))); } else { - _caption->unset_fade_in (); + _text->unset_fade_in (); } if (_force_fade_out->GetValue ()) { - _caption->set_fade_out (_fade_out->get(_content->active_video_frame_rate(film))); + _text->set_fade_out (_fade_out->get(_content->active_video_frame_rate(film))); } else { - _caption->unset_fade_out (); + _text->unset_fade_out (); } - _caption->set_outline_width (_outline_width->GetValue ()); + _text->set_outline_width (_outline_width->GetValue ()); if (_stream) { - for (map::const_iterator i = _pickers.begin(); i != _pickers.end(); ++i) { - _stream->set_colour (i->first, i->second->colour ()); + for (auto const& i: _pickers) { + _stream->set_colour (i.first, i.second->colour()); } } - shared_ptr fc = dynamic_pointer_cast (_content); + auto fc = dynamic_pointer_cast (_content); if (fc) { fc->signal_subtitle_stream_changed (); } @@ -283,8 +293,8 @@ SubtitleAppearanceDialog::apply () void SubtitleAppearanceDialog::restore () { - for (map::const_iterator i = _pickers.begin(); i != _pickers.end(); ++i) { - i->second->set (i->first); + for (auto const& i: _pickers) { + i.second->set (i.first); } } @@ -297,12 +307,12 @@ 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 && _caption->burn (); + bool const can_outline_width = _effect->GetSelection() == OUTLINE && _text->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 captions")); + _outline_width->SetToolTip (_("Outline width cannot be set unless you are burning in subtitles.")); } } @@ -323,13 +333,13 @@ SubtitleAppearanceDialog::active_jobs_changed (optional last) void SubtitleAppearanceDialog::add_colours () { - map colours = _stream->colours (); - for (map::const_iterator i = colours.begin(); i != colours.end(); ++i) { - wxPanel* from = new wxPanel (_colours_panel, wxID_ANY); - from->SetBackgroundColour (wxColour (i->first.r, i->first.g, i->first.b, i->first.a)); + auto colours = _stream->colours (); + for (auto const& i: _stream->colours()) { + auto from = new wxPanel(_colours_panel, wxID_ANY); + from->SetBackgroundColour(wxColour(i.first.r, i.first.g, i.first.b, i.first.a)); _colour_table->Add (from, 1, wxEXPAND); - RGBAColourPicker* to = new RGBAColourPicker (_colours_panel, i->second); + auto to = new RGBAColourPicker(_colours_panel, i.second); _colour_table->Add (to, 1, wxEXPAND); - _pickers[i->first] = to; + _pickers[i.first] = to; } }