X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=76dd21489f831b54c1a56a51a58f0d42eeb38ea4;hp=a2ae72ac9d469e782b6f4222485a874b8b78f563;hb=693013b77341e4177c792de091ab9a524e33c477;hpb=a8c230896e536b09068cfc3433047f34ef3f825f diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index a2ae72ac9..76dd21489 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,64 +18,75 @@ */ -#include "text_panel.h" -#include "film_editor.h" -#include "wx_util.h" -#include "text_view.h" + +#include "check_box.h" #include "content_panel.h" -#include "fonts_dialog.h" #include "dcp_text_track_dialog.h" -#include "subtitle_appearance_dialog.h" -#include "static_text.h" -#include "check_box.h" #include "dcpomatic_button.h" +#include "dcpomatic_spin_ctrl.h" +#include "film_editor.h" #include "film_viewer.h" -#include "lib/job_manager.h" -#include "lib/ffmpeg_content.h" -#include "lib/string_text_file_content.h" -#include "lib/ffmpeg_subtitle_stream.h" +#include "fonts_dialog.h" +#include "language_tag_widget.h" +#include "static_text.h" +#include "subtitle_appearance_dialog.h" +#include "text_panel.h" +#include "text_view.h" +#include "wx_ptr.h" +#include "wx_util.h" +#include "lib/analyse_subtitles_job.h" +#include "lib/dcp_content.h" #include "lib/dcp_subtitle_content.h" -#include "lib/string_text_file_decoder.h" #include "lib/dcp_subtitle_decoder.h" -#include "lib/dcp_content.h" -#include "lib/text_content.h" #include "lib/decoder_factory.h" -#include "lib/analyse_subtitles_job.h" +#include "lib/ffmpeg_content.h" +#include "lib/ffmpeg_subtitle_stream.h" +#include "lib/job_manager.h" +#include "lib/scope_guard.h" +#include "lib/string_text_file_content.h" +#include "lib/string_text_file_decoder.h" #include "lib/subtitle_analysis.h" +#include "lib/text_content.h" +#include +LIBDCP_DISABLE_WARNINGS #include -#include +LIBDCP_ENABLE_WARNINGS + -using std::vector; -using std::string; -using std::list; using std::cout; -using boost::shared_ptr; -using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; +using std::list; +using std::shared_ptr; +using std::string; +using std::vector; using boost::bind; +using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif + /** @param t Original text type of the content, if known */ TextPanel::TextPanel (ContentPanel* p, TextType t) : ContentSubPanel (p, std_to_wx(text_type_to_name(t))) - , _outline_subtitles (0) - , _dcp_track_label (0) - , _dcp_track (0) - , _language_label (0) - , _language (0) - , _text_view (0) - , _fonts_dialog (0) , _original_type (t) - , _loading_analysis (false) +{ + +} + + +void +TextPanel::create () { wxString refer = _("Use this DCP's subtitle as OV and make VF"); - if (t == TEXT_CLOSED_CAPTION) { + if (_original_type == TextType::CLOSED_CAPTION) { refer = _("Use this DCP's closed caption as OV and make VF"); } _reference = new CheckBox (this, refer); _reference_note = new StaticText (this, wxT("")); _reference_note->Wrap (200); - wxFont font = _reference_note->GetFont(); + auto font = _reference_note->GetFont(); font.SetStyle(wxFONTSTYLE_ITALIC); font.SetPointSize(font.GetPointSize() - 1); _reference_note->SetFont(font); @@ -87,30 +98,24 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _burn = new CheckBox (this, _("Burn subtitles into image")); -#ifdef __WXGTK3__ - int const spin_width = 118; -#else - int const spin_width = 56; -#endif - _offset_label = create_label (this, _("Offset"), true); _x_offset_label = create_label (this, _("X"), true); - _x_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(spin_width, -1)); + _x_offset = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _x_offset_pc_label = new StaticText (this, _("%")); _y_offset_label = create_label (this, _("Y"), true); - _y_offset = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(spin_width, -1)); + _y_offset = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _y_offset_pc_label = new StaticText (this, _("%")); _scale_label = create_label (this, _("Scale"), true); _x_scale_label = create_label (this, _("X"), true); - _x_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(spin_width, -1)); + _x_scale = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _x_scale_pc_label = new StaticText (this, _("%")); _y_scale_label = create_label (this, S_("Coord|Y"), true); - _y_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(spin_width, -1)); + _y_scale = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _y_scale_pc_label = new StaticText (this, _("%")); _line_spacing_label = create_label (this, _("Line spacing"), true); - _line_spacing = new wxSpinCtrl (this); + _line_spacing = new SpinCtrl (this, DCPOMATIC_SPIN_CTRL_WIDTH); _line_spacing_pc_label = new StaticText (this, _("%")); _stream_label = create_label (this, _("Stream"), true); @@ -122,14 +127,14 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _x_offset->SetRange (-100, 100); _y_offset->SetRange (-100, 100); - _x_scale->SetRange (10, 1000); - _y_scale->SetRange (10, 1000); - _line_spacing->SetRange (10, 1000); + _x_scale->SetRange (0, 1000); + _y_scale->SetRange (0, 1000); + _line_spacing->SetRange (0, 1000); - _reference->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::reference_clicked, this)); - _use->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::use_toggled, this)); + _reference->bind(&TextPanel::reference_clicked, this); + _use->bind(&TextPanel::use_toggled, this); _type->Bind (wxEVT_CHOICE, boost::bind (&TextPanel::type_changed, this)); - _burn->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::burn_toggled, this)); + _burn->bind(&TextPanel::burn_toggled, this); _x_offset->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_offset_changed, this)); _y_offset->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_offset_changed, this)); _x_scale->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::x_scale_changed, this)); @@ -142,61 +147,74 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) add_to_grid(); content_selection_changed (); + + _sizer->Layout (); } + void TextPanel::setup_visibility () { switch (current_type()) { - case TEXT_OPEN_SUBTITLE: + case TextType::OPEN_SUBTITLE: if (_dcp_track_label) { _dcp_track_label->Destroy (); - _dcp_track_label = 0; + _dcp_track_label = nullptr; } if (_dcp_track) { _dcp_track->Destroy (); - _dcp_track = 0; - } - if (!_language_label) { - _language_label = create_label (this, _("Language"), true); - add_label_to_sizer (_grid, _language_label, true, wxGBPosition(_language_row, 0)); - } - if (!_language) { - _language = new wxTextCtrl (this, wxID_ANY); - _language->Bind (wxEVT_TEXT, boost::bind(&TextPanel::language_changed, this)); - _grid->Add (_language, wxGBPosition(_language_row, 1), wxDefaultSpan, wxEXPAND); - film_content_changed (TextContentProperty::LANGUAGE); + _dcp_track = nullptr; } if (!_outline_subtitles) { _outline_subtitles = new CheckBox (this, _("Show subtitle area")); - _outline_subtitles->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::outline_subtitles_changed, this)); + _outline_subtitles->bind(&TextPanel::outline_subtitles_changed, this); _grid->Add (_outline_subtitles, wxGBPosition(_outline_subtitles_row, 0), wxGBSpan(1, 2)); } - + if (!_language) { + _language_label = create_label (this, _("Language"), true); + add_label_to_sizer (_grid, _language_label, true, wxGBPosition(_ccap_track_or_language_row, 0)); + _language_sizer = new wxBoxSizer (wxHORIZONTAL); + _language = new LanguageTagWidget (this, _("Language of these subtitles"), boost::none, wxString("en-US-")); + _language->Changed.connect (boost::bind(&TextPanel::language_changed, this)); + _language_sizer->Add (_language->sizer(), 1, wxRIGHT, DCPOMATIC_SIZER_GAP); + _language_type = new wxChoice (this, wxID_ANY); + /// TRANSLATORS: Main and Additional here are a choice for whether a set of subtitles is in the "main" language of the + /// film or an "additional" language. + _language_type->Append (_("Main")); + _language_type->Append (_("Additional")); + _language_type->Bind (wxEVT_CHOICE, boost::bind(&TextPanel::language_is_additional_changed, this)); + _language_sizer->Add (_language_type, 0, wxALIGN_CENTER_VERTICAL | wxTOP, DCPOMATIC_CHOICE_TOP_PAD); + _grid->Add (_language_sizer, wxGBPosition(_ccap_track_or_language_row, 1), wxGBSpan(1, 2)); + film_content_changed (TextContentProperty::LANGUAGE); + film_content_changed (TextContentProperty::LANGUAGE_IS_ADDITIONAL); + } break; - case TEXT_CLOSED_CAPTION: + case TextType::CLOSED_CAPTION: if (_language_label) { _language_label->Destroy (); - _language_label = 0; - } - if (_language) { - _language->Destroy (); - _language = 0; + _language_label = nullptr; + _grid->Remove (_language->sizer()); + delete _language; + _grid->Remove (_language_sizer); + _language_sizer = nullptr; + _language = nullptr; + _language_type->Destroy (); + _language_type = nullptr; } if (!_dcp_track_label) { _dcp_track_label = create_label (this, _("CCAP track"), true); - add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(_language_row, 0)); + add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(_ccap_track_or_language_row, 0)); } if (!_dcp_track) { _dcp_track = new wxChoice (this, wxID_ANY); _dcp_track->Bind (wxEVT_CHOICE, boost::bind(&TextPanel::dcp_track_changed, this)); - _grid->Add (_dcp_track, wxGBPosition(_language_row, 1), wxDefaultSpan, wxEXPAND); + _grid->Add (_dcp_track, wxGBPosition(_ccap_track_or_language_row, 1), wxDefaultSpan, wxEXPAND); update_dcp_tracks (); film_content_changed (TextContentProperty::DCP_TRACK); } if (_outline_subtitles) { _outline_subtitles->Destroy (); - _outline_subtitles = 0; + _outline_subtitles = nullptr; clear_outline_subtitles (); } break; @@ -207,25 +225,19 @@ TextPanel::setup_visibility () _grid->Layout (); } + void TextPanel::add_to_grid () { - Config::Interface const interface = Config::instance()->interface_complexity(); - int r = 0; - _reference->Show (interface == Config::INTERFACE_FULL); - _reference_note->Show (interface == Config::INTERFACE_FULL); - - if (interface == Config::INTERFACE_FULL) { - wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); - reference_sizer->Add (_reference, 0); - reference_sizer->Add (_reference_note, 0); - _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4)); - ++r; - } + auto reference_sizer = new wxBoxSizer (wxVERTICAL); + reference_sizer->Add (_reference, 0); + reference_sizer->Add (_reference_note, 0); + _grid->Add (reference_sizer, wxGBPosition(r, 0), wxGBSpan(1, 4)); + ++r; - wxBoxSizer* use = new wxBoxSizer (wxHORIZONTAL); + auto use = new wxBoxSizer (wxHORIZONTAL); use->Add (_use, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); use->Add (_type, 1, wxEXPAND, 0); _grid->Add (use, wxGBPosition (r, 0), wxGBSpan (1, 2)); @@ -238,37 +250,47 @@ TextPanel::add_to_grid () ++r; add_label_to_sizer (_grid, _offset_label, true, wxGBPosition (r, 0)); - wxBoxSizer* offset = new wxBoxSizer (wxHORIZONTAL); - add_label_to_sizer (offset, _x_offset_label, true); + auto offset = new wxBoxSizer (wxHORIZONTAL); + add_label_to_sizer (offset, _x_offset_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); offset->Add (_x_offset, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); offset->Add (_x_offset_pc_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2); - add_label_to_sizer (offset, _y_offset_label, true); - offset->Add (_y_offset, 0); - add_label_to_sizer (offset, _y_offset_pc_label, false); +#ifdef __WXGTK3__ + _grid->Add (offset, wxGBPosition(r, 1)); + ++r; + offset = new wxBoxSizer (wxHORIZONTAL); +#endif + add_label_to_sizer (offset, _y_offset_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + offset->Add (_y_offset, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + add_label_to_sizer (offset, _y_offset_pc_label, false, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL); _grid->Add (offset, wxGBPosition (r, 1)); ++r; add_label_to_sizer (_grid, _scale_label, true, wxGBPosition (r, 0)); - wxBoxSizer* scale = new wxBoxSizer (wxHORIZONTAL); - add_label_to_sizer (scale, _x_scale_label, true); + auto scale = new wxBoxSizer (wxHORIZONTAL); + add_label_to_sizer (scale, _x_scale_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); scale->Add (_x_scale, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); scale->Add (_x_scale_pc_label, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP * 2); - add_label_to_sizer (scale, _y_scale_label, true); - scale->Add (_y_scale, 0); - add_label_to_sizer (scale, _y_scale_pc_label, false); +#ifdef __WXGTK3__ + _grid->Add (scale, wxGBPosition(r, 1)); + ++r; + scale = new wxBoxSizer (wxHORIZONTAL); +#endif + add_label_to_sizer (scale, _y_scale_label, true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); + scale->Add (_y_scale, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL, DCPOMATIC_SIZER_X_GAP); + add_label_to_sizer (scale, _y_scale_pc_label, false, 0, wxRIGHT | wxALIGN_CENTER_VERTICAL); _grid->Add (scale, wxGBPosition (r, 1)); ++r; { add_label_to_sizer (_grid, _line_spacing_label, true, wxGBPosition (r, 0)); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + auto s = new wxBoxSizer (wxHORIZONTAL); s->Add (_line_spacing); - add_label_to_sizer (s, _line_spacing_pc_label, false); + add_label_to_sizer (s, _line_spacing_pc_label, false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL); _grid->Add (s, wxGBPosition (r, 1)); ++r; } - _language_row = r; + _ccap_track_or_language_row = r; ++r; add_label_to_sizer (_grid, _stream_label, true, wxGBPosition (r, 0)); @@ -276,19 +298,20 @@ TextPanel::add_to_grid () ++r; { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + auto s = new wxBoxSizer (wxHORIZONTAL); - s->Add (_text_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP); - s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); - s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); + s->Add (_text_view_button, 0, wxALL, DCPOMATIC_SIZER_GAP); + s->Add (_fonts_dialog_button, 0, wxALL, DCPOMATIC_SIZER_GAP); + s->Add (_appearance_dialog_button, 0, wxALL, DCPOMATIC_SIZER_GAP); - _grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2)); + _grid->Add (s, wxGBPosition(r, 0), wxGBSpan(1, 2)); ++r; } setup_visibility (); } + void TextPanel::update_dcp_track_selection () { @@ -296,10 +319,10 @@ TextPanel::update_dcp_track_selection () optional selected; bool many = false; - BOOST_FOREACH (shared_ptr i, _parent->selected_text()) { - shared_ptr t = i->text_of_original_type(_original_type); + for (auto i: _parent->selected_text()) { + auto t = i->text_of_original_type(_original_type); if (t) { - optional dt = t->dcp_track(); + auto dt = t->dcp_track(); if (dt && selected && *dt != *selected) { many = true; } else if (!selected) { @@ -309,7 +332,7 @@ TextPanel::update_dcp_track_selection () } int n = 0; - BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) { + for (auto i: _parent->film()->closed_caption_tracks()) { if (!many && selected && *selected == i) { _dcp_track->SetSelection (n); } @@ -321,17 +344,18 @@ TextPanel::update_dcp_track_selection () } } + void TextPanel::update_dcp_tracks () { DCPOMATIC_ASSERT (_dcp_track); _dcp_track->Clear (); - BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) { + for (auto i: _parent->film()->closed_caption_tracks()) { /* XXX: don't display the "magic" track which has empty name and language; this is a nasty hack (see also Film::closed_caption_tracks) */ - if (!i.name.empty() || !i.language.empty()) { + if (!i.name.empty() || i.language) { _dcp_track->Append (std_to_wx(i.summary())); } } @@ -343,20 +367,20 @@ TextPanel::update_dcp_tracks () update_dcp_track_selection (); } + void TextPanel::dcp_track_changed () { optional track; if (_dcp_track->GetSelection() == int(_dcp_track->GetCount()) - 1) { - DCPTextTrackDialog* d = new DCPTextTrackDialog (this); + auto d = make_wx(this); if (d->ShowModal() == wxID_OK) { track = d->get(); } - d->Destroy (); } else { /* Find the DCPTextTrack that was selected */ - BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) { + for (auto i: _parent->film()->closed_caption_tracks()) { if (i.summary() == wx_to_std(_dcp_track->GetStringSelection())) { track = i; } @@ -364,9 +388,9 @@ TextPanel::dcp_track_changed () } if (track) { - BOOST_FOREACH (shared_ptr i, _parent->selected_text()) { - shared_ptr t = i->text_of_original_type(_original_type); - if (t && t->type() == TEXT_CLOSED_CAPTION) { + for (auto i: _parent->selected_text()) { + auto t = i->text_of_original_type(_original_type); + if (t && t->type() == TextType::CLOSED_CAPTION) { t->set_dcp_track(*track); } } @@ -375,19 +399,21 @@ TextPanel::dcp_track_changed () update_dcp_tracks (); } + void TextPanel::film_changed (Film::Property property) { - if (property == Film::CONTENT || property == Film::REEL_TYPE || property == Film::INTEROP) { + if (property == Film::Property::CONTENT || property == Film::Property::REEL_TYPE || property == Film::Property::INTEROP) { setup_sensitivity (); } } + void TextPanel::film_content_changed (int property) { - FFmpegContentList fc = _parent->selected_ffmpeg (); - ContentList sc = _parent->selected_text (); + auto fc = _parent->selected_ffmpeg (); + auto sc = _parent->selected_text (); shared_ptr fcs; if (fc.size() == 1) { @@ -407,9 +433,8 @@ TextPanel::film_content_changed (int property) if (property == FFmpegContentProperty::SUBTITLE_STREAMS) { _stream->Clear (); if (fcs) { - vector > s = fcs->subtitle_streams (); - for (vector >::iterator i = s.begin(); i != s.end(); ++i) { - _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ()))); + for (auto i: fcs->subtitle_streams()) { + _stream->Append (std_to_wx(i->name), new wxStringClientData(std_to_wx(i->identifier()))); } if (fcs->subtitle_stream()) { @@ -427,10 +452,10 @@ TextPanel::film_content_changed (int property) } else if (property == TextContentProperty::TYPE) { if (text) { switch (text->type()) { - case TEXT_OPEN_SUBTITLE: + case TextType::OPEN_SUBTITLE: _type->SetSelection (0); break; - case TEXT_CLOSED_CAPTION: + case TextType::CLOSED_CAPTION: _type->SetSelection (1); break; default: @@ -458,17 +483,21 @@ TextPanel::film_content_changed (int property) } else if (property == TextContentProperty::LINE_SPACING) { checked_set (_line_spacing, text ? lrint (text->line_spacing() * 100) : 100); clear_outline_subtitles (); - } else if (property == TextContentProperty::LANGUAGE) { - if (_language) { - checked_set (_language, text ? text->language() : ""); - } } else if (property == TextContentProperty::DCP_TRACK) { if (_dcp_track) { update_dcp_track_selection (); } + } else if (property == TextContentProperty::LANGUAGE) { + if (_language) { + _language->set (text ? text->language() : boost::none); + } + } else if (property == TextContentProperty::LANGUAGE_IS_ADDITIONAL) { + if (_language_type) { + _language_type->SetSelection (text ? (text->language_is_additional() ? 1 : 0) : 0); + } } else if (property == DCPContentProperty::REFERENCE_TEXT) { if (scs) { - shared_ptr dcp = dynamic_pointer_cast (scs); + auto dcp = dynamic_pointer_cast (scs); checked_set (_reference, dcp ? dcp->reference_text(_original_type) : false); } else { checked_set (_reference, false); @@ -477,49 +506,56 @@ TextPanel::film_content_changed (int property) setup_sensitivity (); } else if (property == DCPContentProperty::TEXTS) { setup_sensitivity (); + } else if (property == ContentProperty::TRIM_START) { + setup_sensitivity (); } } + void TextPanel::use_toggled () { - BOOST_FOREACH (shared_ptr i, _parent->selected_text()) { + for (auto i: _parent->selected_text()) { i->text_of_original_type(_original_type)->set_use (_use->GetValue()); } } + /** @return the text type that is currently selected in the drop-down */ TextType TextPanel::current_type () const { switch (_type->GetSelection()) { case 0: - return TEXT_OPEN_SUBTITLE; + return TextType::OPEN_SUBTITLE; case 1: - return TEXT_CLOSED_CAPTION; + return TextType::CLOSED_CAPTION; } - return TEXT_UNKNOWN; + return TextType::UNKNOWN; } + void TextPanel::type_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_text()) { + for (auto i: _parent->selected_text()) { i->text_of_original_type(_original_type)->set_type (current_type ()); } setup_visibility (); } + void TextPanel::burn_toggled () { - BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { + for (auto i: _parent->selected_text ()) { i->text_of_original_type(_original_type)->set_burn (_burn->GetValue()); } } + void TextPanel::setup_sensitivity () { @@ -528,13 +564,13 @@ TextPanel::setup_sensitivity () int ffmpeg_subs = 0; /* DCP subs can't have their line spacing changed */ int dcp_subs = 0; - ContentList sel = _parent->selected_text (); - BOOST_FOREACH (shared_ptr i, sel) { + auto sel = _parent->selected_text (); + for (auto i: sel) { /* These are the content types that could include subtitles */ - shared_ptr fc = boost::dynamic_pointer_cast (i); - shared_ptr sc = boost::dynamic_pointer_cast (i); - shared_ptr dc = boost::dynamic_pointer_cast (i); - shared_ptr dsc = boost::dynamic_pointer_cast (i); + auto fc = std::dynamic_pointer_cast(i); + auto sc = std::dynamic_pointer_cast(i); + auto dc = std::dynamic_pointer_cast(i); + auto dsc = std::dynamic_pointer_cast(i); if (fc) { if (!fc->text.empty()) { ++ffmpeg_subs; @@ -553,7 +589,7 @@ TextPanel::setup_sensitivity () shared_ptr dcp; if (sel.size() == 1) { - dcp = dynamic_pointer_cast (sel.front ()); + dcp = dynamic_pointer_cast(sel.front()); } string why_not; @@ -568,7 +604,7 @@ TextPanel::setup_sensitivity () bool const reference = _reference->GetValue (); - TextType const type = current_type (); + auto const type = current_type (); /* Set up _type */ _type->Clear (); @@ -578,10 +614,10 @@ TextPanel::setup_sensitivity () } switch (type) { - case TEXT_OPEN_SUBTITLE: + case TextType::OPEN_SUBTITLE: _type->SetSelection (0); break; - case TEXT_CLOSED_CAPTION: + case TextType::CLOSED_CAPTION: if (_type->GetCount() > 1) { _type->SetSelection (1); } @@ -594,35 +630,36 @@ TextPanel::setup_sensitivity () _use->Enable (!reference && any_subs > 0); bool const use = _use->GetValue (); if (_outline_subtitles) { - _outline_subtitles->Enable (!_loading_analysis && any_subs && use && type == TEXT_OPEN_SUBTITLE); + _outline_subtitles->Enable (!_loading_analysis && any_subs && use && type == TextType::OPEN_SUBTITLE); } _type->Enable (!reference && any_subs > 0 && use); - _burn->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); - _x_offset->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); - _y_offset->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); - _x_scale->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); - _y_scale->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); - _line_spacing->Enable (!reference && use && type == TEXT_OPEN_SUBTITLE && dcp_subs < any_subs); + _burn->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE); + _x_offset->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE); + _y_offset->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE); + _x_scale->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE); + _y_scale->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE); + _line_spacing->Enable (!reference && use && type == TextType::OPEN_SUBTITLE && dcp_subs < any_subs); _stream->Enable (!reference && ffmpeg_subs == 1); /* Ideally we would check here to see if the FFmpeg content has "string" subs (i.e. not bitmaps) */ _text_view_button->Enable (!reference && any_subs > 0 && ffmpeg_subs == 0); - _fonts_dialog_button->Enable (!reference && any_subs > 0 && ffmpeg_subs == 0 && type == TEXT_OPEN_SUBTITLE); - _appearance_dialog_button->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); + _fonts_dialog_button->Enable (!reference && any_subs > 0 && ffmpeg_subs == 0 && type == TextType::OPEN_SUBTITLE); + _appearance_dialog_button->Enable (!reference && any_subs > 0 && use && type == TextType::OPEN_SUBTITLE); } + void TextPanel::stream_changed () { - FFmpegContentList fc = _parent->selected_ffmpeg (); + auto fc = _parent->selected_ffmpeg (); if (fc.size() != 1) { return; } - shared_ptr fcs = fc.front (); + auto fcs = fc.front (); - vector > a = fcs->subtitle_streams (); - vector >::iterator i = a.begin (); - string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ())); + auto a = fcs->subtitle_streams (); + auto i = a.begin (); + auto const s = string_client_data (_stream->GetClientObject(_stream->GetSelection())); while (i != a.end() && (*i)->identifier () != s) { ++i; } @@ -632,55 +669,51 @@ TextPanel::stream_changed () } } + void TextPanel::x_offset_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { + for (auto i: _parent->selected_text ()) { i->text_of_original_type(_original_type)->set_x_offset (_x_offset->GetValue() / 100.0); } } + void TextPanel::y_offset_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { + for (auto i: _parent->selected_text ()) { i->text_of_original_type(_original_type)->set_y_offset (_y_offset->GetValue() / 100.0); } } + void TextPanel::x_scale_changed () { - ContentList c = _parent->selected_text (); - if (c.size() == 1) { - c.front()->text_of_original_type(_original_type)->set_x_scale (_x_scale->GetValue() / 100.0); + for (auto i: _parent->selected_text ()) { + i->text_of_original_type(_original_type)->set_x_scale (_x_scale->GetValue() / 100.0); } } + void TextPanel::y_scale_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { + for (auto i: _parent->selected_text ()) { i->text_of_original_type(_original_type)->set_y_scale (_y_scale->GetValue() / 100.0); } } + void TextPanel::line_spacing_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { + for (auto i: _parent->selected_text ()) { i->text_of_original_type(_original_type)->set_line_spacing (_line_spacing->GetValue() / 100.0); } } -void -TextPanel::language_changed () -{ - DCPOMATIC_ASSERT (_language); - BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { - i->text_of_original_type(_original_type)->set_language (wx_to_std (_language->GetValue())); - } -} void TextPanel::content_selection_changed () @@ -693,56 +726,50 @@ TextPanel::content_selection_changed () film_content_changed (TextContentProperty::X_SCALE); film_content_changed (TextContentProperty::Y_SCALE); film_content_changed (TextContentProperty::LINE_SPACING); - film_content_changed (TextContentProperty::LANGUAGE); film_content_changed (TextContentProperty::FONTS); film_content_changed (TextContentProperty::TYPE); film_content_changed (TextContentProperty::DCP_TRACK); + film_content_changed (TextContentProperty::LANGUAGE); + film_content_changed (TextContentProperty::LANGUAGE_IS_ADDITIONAL); film_content_changed (DCPContentProperty::REFERENCE_TEXT); } + void TextPanel::text_view_clicked () { - if (_text_view) { - _text_view->Destroy (); - _text_view = 0; - } - - ContentList c = _parent->selected_text (); + auto c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - shared_ptr decoder = decoder_factory (_parent->film(), c.front(), false, false, shared_ptr()); + auto decoder = decoder_factory (_parent->film(), c.front(), false, false, shared_ptr()); if (decoder) { - _text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer()); + _text_view.reset(this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer()); _text_view->Show (); } } + void TextPanel::fonts_dialog_clicked () { - if (_fonts_dialog) { - _fonts_dialog->Destroy (); - _fonts_dialog = 0; - } - - ContentList c = _parent->selected_text (); + auto c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - _fonts_dialog = new FontsDialog (this, c.front(), c.front()->text_of_original_type(_original_type)); + _fonts_dialog.reset(this, c.front(), c.front()->text_of_original_type(_original_type)); _fonts_dialog->Show (); } + void TextPanel::reference_clicked () { - ContentList c = _parent->selected (); + auto c = _parent->selected (); if (c.size() != 1) { return; } - shared_ptr d = dynamic_pointer_cast (c.front ()); + auto d = dynamic_pointer_cast (c.front ()); if (!d) { return; } @@ -750,21 +777,20 @@ TextPanel::reference_clicked () d->set_reference_text (_original_type, _reference->GetValue ()); } + void TextPanel::appearance_dialog_clicked () { - ContentList c = _parent->selected_text (); + auto c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type)); - if (d->ShowModal () == wxID_OK) { - d->apply (); + SubtitleAppearanceDialog dialog(this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type)); + if (dialog.ShowModal() == wxID_OK) { + dialog.apply(); } - d->Destroy (); } - /** The user has clicked on the outline subtitles check box */ void TextPanel::outline_subtitles_changed () @@ -786,27 +812,30 @@ TextPanel::try_to_load_analysis () } _loading_analysis = true; + ScopeGuard sg = [this]() { + _loading_analysis = false; + setup_sensitivity(); + }; + setup_sensitivity (); _analysis.reset (); - shared_ptr content = _analysis_content.lock (); + auto content = _analysis_content.lock (); if (!content) { - _loading_analysis = false; - setup_sensitivity (); return; } - boost::filesystem::path const path = _parent->film()->subtitle_analysis_path(content); + auto const path = _parent->film()->subtitle_analysis_path(content); if (!boost::filesystem::exists(path)) { - BOOST_FOREACH (shared_ptr i, JobManager::instance()->get()) { - if (dynamic_pointer_cast(i)) { + for (auto i: JobManager::instance()->get()) { + if (dynamic_pointer_cast(i) && !i->finished()) { i->cancel (); } } JobManager::instance()->analyse_subtitles ( - _parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this) + _parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this, _1) ); return; } @@ -816,36 +845,31 @@ TextPanel::try_to_load_analysis () } catch (OldFormatError& e) { /* An old analysis file: recreate it */ JobManager::instance()->analyse_subtitles ( - _parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this) + _parent->film(), content, _analysis_finished_connection, bind(&TextPanel::analysis_finished, this, _1) ); return; - } + } update_outline_subtitles_in_viewer (); - _loading_analysis = false; - setup_sensitivity (); } void TextPanel::update_outline_subtitles_in_viewer () { - shared_ptr fv = _parent->film_viewer().lock(); - if (!fv) { - return; - } + auto& fv = _parent->film_viewer(); if (_analysis) { - optional > rect = _analysis->bounding_box (); + auto rect = _analysis->bounding_box (); if (rect) { - shared_ptr content = _analysis_content.lock (); + auto content = _analysis_content.lock (); DCPOMATIC_ASSERT (content); - rect->x += content->text.front()->x_offset(); - rect->y += content->text.front()->y_offset(); + rect->x += content->text.front()->x_offset() - _analysis->analysis_x_offset(); + rect->y += content->text.front()->y_offset() - _analysis->analysis_y_offset(); } - fv->set_outline_subtitles (rect); + fv.set_outline_subtitles(rect); } else { - fv->set_outline_subtitles (optional >()); + fv.set_outline_subtitles({}); } } @@ -863,27 +887,49 @@ TextPanel::clear_outline_subtitles () void -TextPanel::analysis_finished () +TextPanel::analysis_finished(Job::Result result) { - shared_ptr content = _analysis_content.lock (); - if (!content) { - _loading_analysis = false; - setup_sensitivity (); + _loading_analysis = false; + + auto content = _analysis_content.lock (); + if (!content || result == Job::Result::RESULT_CANCELLED) { + clear_outline_subtitles(); + setup_sensitivity(); return; } if (!boost::filesystem::exists(_parent->film()->subtitle_analysis_path(content))) { - /* We analysed and still nothing showed up, so maybe it was cancelled or it failed. - Give up. - */ + /* We analysed and still nothing showed up, so maybe it failed. Give up. */ error_dialog (_parent->window(), _("Could not analyse subtitles.")); clear_outline_subtitles (); - _loading_analysis = false; setup_sensitivity (); return; } - _loading_analysis = false; try_to_load_analysis (); } + +void +TextPanel::language_changed () +{ + for (auto i: _parent->selected_text()) { + auto t = i->text_of_original_type(_original_type); + if (t) { + t->set_language (_language->get()); + } + } +} + + +void +TextPanel::language_is_additional_changed () +{ + for (auto i: _parent->selected_text()) { + auto t = i->text_of_original_type(_original_type); + if (t) { + t->set_language_is_additional (_language_type->GetSelection() == 1); + } + } +} +