X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=2121ba388254d6a6b9a61dc1220ded90274b5ab0;hp=350dddc0dffe9d5b2d6952673c76735b4a6f7994;hb=e8582393bd1367fff36bae8e053d799073d8b2ed;hpb=3c79703cf661285fca32a956f8c8a9cb185ea7fa diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index 350dddc0d..2121ba388 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -26,6 +26,9 @@ #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 "lib/ffmpeg_content.h" #include "lib/string_text_file_content.h" #include "lib/ffmpeg_subtitle_stream.h" @@ -58,40 +61,40 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) refer = _("Use this DCP's closed caption as OV and make VF"); } - _reference = new wxCheckBox (this, wxID_ANY, refer); - _reference_note = new wxStaticText (this, wxID_ANY, wxT("")); + _reference = new CheckBox (this, refer); + _reference_note = new StaticText (this, wxT("")); _reference_note->Wrap (200); wxFont font = _reference_note->GetFont(); font.SetStyle(wxFONTSTYLE_ITALIC); font.SetPointSize(font.GetPointSize() - 1); _reference_note->SetFont(font); - _use = new wxCheckBox (this, wxID_ANY, _("Use as")); + _use = new CheckBox (this, _("Use as")); _type = new wxChoice (this, wxID_ANY); _type->Append (_("open subtitles")); _type->Append (_("closed captions")); - _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image")); + _burn = new CheckBox (this, _("Burn subtitles into image")); _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(64, -1)); - _x_offset_pc_label = new wxStaticText (this, wxID_ANY, _("%")); + _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(64, -1)); - _y_offset_pc_label = new wxStaticText (this, wxID_ANY, _("%")); + _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(64, -1)); - _x_scale_pc_label = new wxStaticText (this, wxID_ANY, _("%")); - _y_scale_label = create_label (this, _("Y"), true); + _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(64, -1)); - _y_scale_pc_label = new wxStaticText (this, wxID_ANY, _("%")); + _y_scale_pc_label = new StaticText (this, _("%")); _line_spacing_label = create_label (this, _("Line spacing"), true); _line_spacing = new wxSpinCtrl (this); - _line_spacing_pc_label = new wxStaticText (this, wxID_ANY, _("%")); + _line_spacing_pc_label = new StaticText (this, _("%")); _dcp_track_label = create_label (this, _("DCP track"), true); _dcp_track = new wxChoice (this, wxID_ANY); @@ -102,9 +105,9 @@ TextPanel::TextPanel (ContentPanel* p, TextType t) _stream_label = create_label (this, _("Stream"), true); _stream = new wxChoice (this, wxID_ANY); - _text_view_button = new wxButton (this, wxID_ANY, _("View...")); - _fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts...")); - _appearance_dialog_button = new wxButton (this, wxID_ANY, _("Appearance...")); + _text_view_button = new Button (this, _("View...")); + _fonts_dialog_button = new Button (this, _("Fonts...")); + _appearance_dialog_button = new Button (this, _("Appearance...")); _x_offset->SetRange (-100, 100); _y_offset->SetRange (-100, 100); @@ -252,7 +255,12 @@ TextPanel::update_dcp_tracks () { _dcp_track->Clear (); BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) { - _dcp_track->Append (std_to_wx(i.summary())); + /* 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()) { + _dcp_track->Append (std_to_wx(i.summary())); + } } if (_parent->film()->closed_caption_tracks().size() < 6) { @@ -297,7 +305,7 @@ TextPanel::dcp_track_changed () void TextPanel::film_changed (Film::Property property) { - if (property == Film::CONTENT || property == Film::REEL_TYPE) { + if (property == Film::CONTENT || property == Film::REEL_TYPE || property == Film::INTEROP) { setup_sensitivity (); } } @@ -430,7 +438,10 @@ void TextPanel::setup_sensitivity () { int any_subs = 0; + /* We currently assume that FFmpeg subtitles are bitmapped */ 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) { /* These are the content types that could include subtitles */ @@ -443,7 +454,10 @@ TextPanel::setup_sensitivity () ++ffmpeg_subs; ++any_subs; } - } else if (sc || dc || dsc) { + } else if (dc || dsc) { + ++dcp_subs; + ++any_subs; + } else if (sc) { /* XXX: in the future there could be bitmap subs from DCPs */ ++any_subs; } @@ -457,13 +471,33 @@ TextPanel::setup_sensitivity () } string why_not; - bool const can_reference = dcp && dcp->can_reference_text (_original_type, why_not); + bool const can_reference = dcp && dcp->can_reference_text (_parent->film(), _original_type, why_not); setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not); bool const reference = _reference->GetValue (); TextType const type = current_type (); + /* Set up _type */ + _type->Clear (); + _type->Append (_("open subtitles")); + if (ffmpeg_subs == 0) { + _type->Append (_("closed captions")); + } + + switch (type) { + case TEXT_OPEN_SUBTITLE: + _type->SetSelection (0); + break; + case TEXT_CLOSED_CAPTION: + if (_type->GetCount() > 1) { + _type->SetSelection (1); + } + break; + default: + break; + } + /* Set up sensitivity */ _use->Enable (!reference && any_subs > 0); bool const use = _use->GetValue (); @@ -473,12 +507,14 @@ TextPanel::setup_sensitivity () _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 ignore the line spacing setting */ + _line_spacing->Enable (!reference && use && type == TEXT_OPEN_SUBTITLE && dcp_subs < any_subs); _dcp_track->Enable (!reference && any_subs > 0 && use && type == TEXT_CLOSED_CAPTION); _language->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); _stream->Enable (!reference && ffmpeg_subs == 1); - _text_view_button->Enable (!reference); - _fonts_dialog_button->Enable (!reference && type == TEXT_OPEN_SUBTITLE); + /* 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); } @@ -582,7 +618,7 @@ TextPanel::text_view_clicked () ContentList c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - shared_ptr decoder = decoder_factory (c.front(), _parent->film()->log(), false); + shared_ptr decoder = decoder_factory (_parent->film(), c.front(), false); if (decoder) { _text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer()); @@ -627,7 +663,7 @@ TextPanel::appearance_dialog_clicked () ContentList c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, c.front(), c.front()->text_of_original_type(_original_type)); + SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type)); if (d->ShowModal () == wxID_OK) { d->apply (); }