X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftext_panel.cc;h=4b53a941e768924c592ad6e83ce9dde06a9e5615;hp=bc1183443b7efefe9553de6753878f690587d274;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc index bc1183443..4b53a941e 100644 --- a/src/wx/text_panel.cc +++ b/src/wx/text_panel.cc @@ -24,6 +24,7 @@ #include "text_view.h" #include "content_panel.h" #include "fonts_dialog.h" +#include "dcp_text_track_dialog.h" #include "subtitle_appearance_dialog.h" #include "lib/ffmpeg_content.h" #include "lib/string_text_file_content.h" @@ -42,141 +43,255 @@ using std::string; using std::list; using std::cout; using boost::shared_ptr; +using boost::optional; using boost::dynamic_pointer_cast; +/** @param t Original text type of the content, if known */ TextPanel::TextPanel (ContentPanel* p, TextType t) - : ContentSubPanel (p, std_to_wx(caption_type_to_name(t))) - , _caption_view (0) + : ContentSubPanel (p, std_to_wx(text_type_to_name(t))) + , _text_view (0) , _fonts_dialog (0) , _original_type (t) { - wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); - - _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's subtitle as OV and make VF")); - reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP); + wxString refer = _("Use this DCP's subtitle as OV and make VF"); + if (t == TEXT_CLOSED_CAPTION) { + refer = _("Use this DCP's closed caption as OV and make VF"); + } - _reference_note = new wxStaticText (this, wxID_ANY, _("")); + _reference = new wxCheckBox (this, wxID_ANY, refer); + _reference_note = new wxStaticText (this, wxID_ANY, wxT("")); _reference_note->Wrap (200); - reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); wxFont font = _reference_note->GetFont(); font.SetStyle(wxFONTSTYLE_ITALIC); font.SetPointSize(font.GetPointSize() - 1); _reference_note->SetFont(font); - _sizer->Add (reference_sizer); + _use = new wxCheckBox (this, wxID_ANY, _("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")); + + _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, _("%")); + _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, _("%")); + + _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); + _y_scale = new wxSpinCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(64, -1)); + _y_scale_pc_label = new wxStaticText (this, wxID_ANY, _("%")); + + _line_spacing_label = create_label (this, _("Line spacing"), true); + _line_spacing = new wxSpinCtrl (this); + _line_spacing_pc_label = new wxStaticText (this, wxID_ANY, _("%")); + + _dcp_track_label = create_label (this, _("DCP track"), true); + _dcp_track = new wxChoice (this, wxID_ANY); + + _language_label = create_label (this, _("Language"), true); + _language = new wxTextCtrl (this, wxID_ANY); + + _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...")); + + _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); + + update_dcp_tracks (); + + content_selection_changed (); + + _reference->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::reference_clicked, this)); + _use->Bind (wxEVT_CHECKBOX, boost::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)); + _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)); + _y_scale->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_scale_changed, this)); + _line_spacing->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::line_spacing_changed, this)); + _dcp_track->Bind (wxEVT_CHOICE, boost::bind (&TextPanel::dcp_track_changed, this)); + _language->Bind (wxEVT_TEXT, boost::bind (&TextPanel::language_changed, this)); + _stream->Bind (wxEVT_CHOICE, boost::bind (&TextPanel::stream_changed, this)); + _text_view_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::text_view_clicked, this)); + _fonts_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::fonts_dialog_clicked, this)); + _appearance_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::appearance_dialog_clicked, this)); + + add_to_grid(); +} + +void +TextPanel::add_to_grid () +{ + Config::Interface const interface = Config::instance()->interface_complexity(); - wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); - _sizer->Add (grid, 0, wxALL, 8); 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; + } + wxBoxSizer* use = new wxBoxSizer (wxHORIZONTAL); - _use = new wxCheckBox (this, wxID_ANY, _("Use as")); use->Add (_use, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); - _type = new wxChoice (this, wxID_ANY); - _type->Append (_("subtitles (open captions)")); - _type->Append (_("closed captions")); use->Add (_type, 1, wxEXPAND, 0); - grid->Add (use, wxGBPosition (r, 0), wxGBSpan (1, 2)); + _grid->Add (use, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; - _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image")); - grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2)); + _grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++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); + 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); + _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); + 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); + _grid->Add (scale, wxGBPosition (r, 1)); ++r; { - add_label_to_sizer (grid, this, _("X Offset"), true, wxGBPosition (r, 0)); + add_label_to_sizer (_grid, _line_spacing_label, true, wxGBPosition (r, 0)); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _x_offset = new wxSpinCtrl (this); - s->Add (_x_offset); - add_label_to_sizer (s, this, _("%"), false); - grid->Add (s, wxGBPosition (r, 1)); + s->Add (_line_spacing); + add_label_to_sizer (s, _line_spacing_pc_label, false); + _grid->Add (s, wxGBPosition (r, 1)); ++r; } + add_label_to_sizer (_grid, _dcp_track_label, true, wxGBPosition(r, 0)); + _grid->Add (_dcp_track, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND); + ++r; + + add_label_to_sizer (_grid, _language_label, true, wxGBPosition (r, 0)); + _grid->Add (_language, wxGBPosition (r, 1)); + ++r; + + add_label_to_sizer (_grid, _stream_label, true, wxGBPosition (r, 0)); + _grid->Add (_stream, wxGBPosition (r, 1)); + ++r; + { - add_label_to_sizer (grid, this, _("Y Offset"), true, wxGBPosition (r, 0)); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _y_offset = new wxSpinCtrl (this); - s->Add (_y_offset); - add_label_to_sizer (s, this, _("%"), false); - grid->Add (s, wxGBPosition (r, 1)); + + 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); + + _grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; } +} - { - add_label_to_sizer (grid, this, _("X Scale"), true, wxGBPosition (r, 0)); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _x_scale = new wxSpinCtrl (this); - s->Add (_x_scale); - add_label_to_sizer (s, this, _("%"), false); - grid->Add (s, wxGBPosition (r, 1)); - ++r; +void +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); + if (t) { + optional dt = t->dcp_track(); + if (dt && selected && *dt != *selected) { + many = true; + } else if (!selected) { + selected = dt; + } + } } - { - add_label_to_sizer (grid, this, _("Y Scale"), true, wxGBPosition (r, 0)); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _y_scale = new wxSpinCtrl (this); - s->Add (_y_scale); - add_label_to_sizer (s, this, _("%"), false); - grid->Add (s, wxGBPosition (r, 1)); - ++r; + int n = 0; + BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) { + if (!many && selected && *selected == i) { + _dcp_track->SetSelection (n); + } + ++n; } - { - add_label_to_sizer (grid, this, _("Line spacing"), true, wxGBPosition (r, 0)); - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _line_spacing = new wxSpinCtrl (this); - s->Add (_line_spacing); - add_label_to_sizer (s, this, _("%"), false); - grid->Add (s, wxGBPosition (r, 1)); - ++r; + if (!selected || many) { + _dcp_track->SetSelection (wxNOT_FOUND); } +} - add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0)); - _language = new wxTextCtrl (this, wxID_ANY); - grid->Add (_language, wxGBPosition (r, 1)); - ++r; +void +TextPanel::update_dcp_tracks () +{ + _dcp_track->Clear (); + BOOST_FOREACH (DCPTextTrack i, _parent->film()->closed_caption_tracks()) { + _dcp_track->Append (std_to_wx(i.summary())); + } - add_label_to_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0)); - _stream = new wxChoice (this, wxID_ANY); - grid->Add (_stream, wxGBPosition (r, 1)); - ++r; + if (_parent->film()->closed_caption_tracks().size() < 6) { + _dcp_track->Append (_("Add new...")); + } - { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + update_dcp_track_selection (); +} - _caption_view_button = new wxButton (this, wxID_ANY, _("View...")); - s->Add (_caption_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP); - _fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts...")); - s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); - _appearance_dialog_button = new wxButton (this, wxID_ANY, _("Appearance...")); - s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); +void +TextPanel::dcp_track_changed () +{ + optional track; - grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2)); - ++r; + if (_dcp_track->GetSelection() == int(_dcp_track->GetCount()) - 1) { + DCPTextTrackDialog* d = new DCPTextTrackDialog (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()) { + if (i.summary() == wx_to_std(_dcp_track->GetStringSelection())) { + track = i; + } + } } - _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); + 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) { + t->set_dcp_track(*track); + } + } + } - _reference->Bind (wxEVT_CHECKBOX, boost::bind (&TextPanel::reference_clicked, this)); - _use->Bind (wxEVT_CHECKBOX, boost::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)); - _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)); - _y_scale->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::y_scale_changed, this)); - _line_spacing->Bind (wxEVT_SPINCTRL, boost::bind (&TextPanel::line_spacing_changed, this)); - _language->Bind (wxEVT_TEXT, boost::bind (&TextPanel::language_changed, this)); - _stream->Bind (wxEVT_CHOICE, boost::bind (&TextPanel::stream_changed, this)); - _caption_view_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::caption_view_clicked, this)); - _fonts_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::fonts_dialog_clicked, this)); - _appearance_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&TextPanel::appearance_dialog_clicked, this)); + update_dcp_tracks (); } void @@ -191,7 +306,7 @@ void TextPanel::film_content_changed (int property) { FFmpegContentList fc = _parent->selected_ffmpeg (); - ContentList sc = _parent->selected_caption (); + ContentList sc = _parent->selected_text (); shared_ptr fcs; if (fc.size() == 1) { @@ -203,9 +318,9 @@ TextPanel::film_content_changed (int property) scs = sc.front (); } - shared_ptr caption; + shared_ptr text; if (scs) { - caption = scs->caption_of_original_type(_original_type); + text = scs->text_of_original_type(_original_type); } if (property == FFmpegContentProperty::SUBTITLE_STREAMS) { @@ -224,15 +339,15 @@ TextPanel::film_content_changed (int property) } setup_sensitivity (); } else if (property == TextContentProperty::USE) { - checked_set (_use, caption ? caption->use() : false); + checked_set (_use, text ? text->use() : false); setup_sensitivity (); } else if (property == TextContentProperty::TYPE) { - if (caption) { - switch (caption->type()) { - case CAPTION_OPEN: + if (text) { + switch (text->type()) { + case TEXT_OPEN_SUBTITLE: _type->SetSelection (0); break; - case CAPTION_CLOSED: + case TEXT_CLOSED_CAPTION: _type->SetSelection (1); break; default: @@ -242,30 +357,33 @@ TextPanel::film_content_changed (int property) _type->SetSelection (0); } setup_sensitivity (); + update_dcp_track_selection (); } else if (property == TextContentProperty::BURN) { - checked_set (_burn, caption ? caption->burn() : false); + checked_set (_burn, text ? text->burn() : false); } else if (property == TextContentProperty::X_OFFSET) { - checked_set (_x_offset, caption ? lrint (caption->x_offset() * 100) : 0); + checked_set (_x_offset, text ? lrint (text->x_offset() * 100) : 0); } else if (property == TextContentProperty::Y_OFFSET) { - checked_set (_y_offset, caption ? lrint (caption->y_offset() * 100) : 0); + checked_set (_y_offset, text ? lrint (text->y_offset() * 100) : 0); } else if (property == TextContentProperty::X_SCALE) { - checked_set (_x_scale, caption ? lrint (caption->x_scale() * 100) : 100); + checked_set (_x_scale, text ? lrint (text->x_scale() * 100) : 100); } else if (property == TextContentProperty::Y_SCALE) { - checked_set (_y_scale, caption ? lrint (caption->y_scale() * 100) : 100); + checked_set (_y_scale, text ? lrint (text->y_scale() * 100) : 100); } else if (property == TextContentProperty::LINE_SPACING) { - checked_set (_line_spacing, caption ? lrint (caption->line_spacing() * 100) : 100); + checked_set (_line_spacing, text ? lrint (text->line_spacing() * 100) : 100); } else if (property == TextContentProperty::LANGUAGE) { - checked_set (_language, caption ? caption->language() : ""); - } else if (property == DCPContentProperty::REFERENCE_CAPTION) { + checked_set (_language, text ? text->language() : ""); + } else if (property == TextContentProperty::DCP_TRACK) { + update_dcp_track_selection (); + } else if (property == DCPContentProperty::REFERENCE_TEXT) { if (scs) { shared_ptr dcp = dynamic_pointer_cast (scs); - checked_set (_reference, dcp ? dcp->reference_caption(_original_type) : false); + checked_set (_reference, dcp ? dcp->reference_text(_original_type) : false); } else { checked_set (_reference, false); } setup_sensitivity (); - } else if (property == DCPContentProperty::CAPTIONS) { + } else if (property == DCPContentProperty::TEXTS) { setup_sensitivity (); } } @@ -273,31 +391,38 @@ TextPanel::film_content_changed (int property) void TextPanel::use_toggled () { - BOOST_FOREACH (shared_ptr i, _parent->selected_caption()) { - i->caption_of_original_type(_original_type)->set_use (_use->GetValue()); + BOOST_FOREACH (shared_ptr 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; + case 1: + return TEXT_CLOSED_CAPTION; + } + + return TEXT_UNKNOWN; +} + void TextPanel::type_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_caption()) { - switch (_type->GetSelection()) { - case 0: - i->caption_of_original_type(_original_type)->set_type (CAPTION_OPEN); - break; - case 1: - i->caption_of_original_type(_original_type)->set_type (CAPTION_CLOSED); - break; - } + BOOST_FOREACH (shared_ptr i, _parent->selected_text()) { + i->text_of_original_type(_original_type)->set_type (current_type ()); } } void TextPanel::burn_toggled () { - BOOST_FOREACH (shared_ptr i, _parent->selected_caption ()) { - i->caption_of_original_type(_original_type)->set_burn (_burn->GetValue()); + BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { + i->text_of_original_type(_original_type)->set_burn (_burn->GetValue()); } } @@ -306,7 +431,7 @@ TextPanel::setup_sensitivity () { int any_subs = 0; int ffmpeg_subs = 0; - ContentList sel = _parent->selected_caption (); + ContentList sel = _parent->selected_text (); BOOST_FOREACH (shared_ptr i, sel) { /* These are the content types that could include subtitles */ shared_ptr fc = boost::dynamic_pointer_cast (i); @@ -314,7 +439,7 @@ TextPanel::setup_sensitivity () shared_ptr dc = boost::dynamic_pointer_cast (i); shared_ptr dsc = boost::dynamic_pointer_cast (i); if (fc) { - if (!fc->caption.empty()) { + if (!fc->text.empty()) { ++ffmpeg_subs; ++any_subs; } @@ -332,26 +457,29 @@ TextPanel::setup_sensitivity () } string why_not; - bool const can_reference = dcp && dcp->can_reference_caption (_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 sensitivity */ _use->Enable (!reference && any_subs > 0); bool const use = _use->GetValue (); _type->Enable (!reference && any_subs > 0 && use); - _burn->Enable (!reference && any_subs > 0 && use && _type->GetSelection() == 0); - _x_offset->Enable (!reference && any_subs > 0 && use); - _y_offset->Enable (!reference && any_subs > 0 && use); - _x_scale->Enable (!reference && any_subs > 0 && use); - _y_scale->Enable (!reference && any_subs > 0 && use); - _line_spacing->Enable (!reference && use); - _language->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_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); - _caption_view_button->Enable (!reference); - _fonts_dialog_button->Enable (!reference); - _appearance_dialog_button->Enable (!reference && any_subs > 0 && use); + _text_view_button->Enable (!reference); + _fonts_dialog_button->Enable (!reference && type == TEXT_OPEN_SUBTITLE); + _appearance_dialog_button->Enable (!reference && any_subs > 0 && use && type == TEXT_OPEN_SUBTITLE); } void @@ -379,49 +507,49 @@ TextPanel::stream_changed () void TextPanel::x_offset_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_caption ()) { - i->caption_of_original_type(_original_type)->set_x_offset (_x_offset->GetValue() / 100.0); + BOOST_FOREACH (shared_ptr 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_caption ()) { - i->caption_of_original_type(_original_type)->set_y_offset (_y_offset->GetValue() / 100.0); + BOOST_FOREACH (shared_ptr 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_caption (); + ContentList c = _parent->selected_text (); if (c.size() == 1) { - c.front()->caption_of_original_type(_original_type)->set_x_scale (_x_scale->GetValue() / 100.0); + c.front()->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_caption ()) { - i->caption_of_original_type(_original_type)->set_y_scale (_y_scale->GetValue() / 100.0); + BOOST_FOREACH (shared_ptr 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_caption ()) { - i->caption_of_original_type(_original_type)->set_line_spacing (_line_spacing->GetValue() / 100.0); + BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { + i->text_of_original_type(_original_type)->set_line_spacing (_line_spacing->GetValue() / 100.0); } } void TextPanel::language_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_caption ()) { - i->caption_of_original_type(_original_type)->set_language (wx_to_std (_language->GetValue())); + BOOST_FOREACH (shared_ptr i, _parent->selected_text ()) { + i->text_of_original_type(_original_type)->set_language (wx_to_std (_language->GetValue())); } } @@ -439,25 +567,26 @@ TextPanel::content_selection_changed () film_content_changed (TextContentProperty::LANGUAGE); film_content_changed (TextContentProperty::FONTS); film_content_changed (TextContentProperty::TYPE); - film_content_changed (DCPContentProperty::REFERENCE_CAPTION); + film_content_changed (TextContentProperty::DCP_TRACK); + film_content_changed (DCPContentProperty::REFERENCE_TEXT); } void -TextPanel::caption_view_clicked () +TextPanel::text_view_clicked () { - if (_caption_view) { - _caption_view->Destroy (); - _caption_view = 0; + if (_text_view) { + _text_view->Destroy (); + _text_view = 0; } - ContentList c = _parent->selected_caption (); + 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) { - _caption_view = new TextView (this, _parent->film(), c.front(), c.front()->caption_of_original_type(_original_type), decoder, _parent->film_viewer()); - _caption_view->Show (); + _text_view = new TextView (this, _parent->film(), c.front(), c.front()->text_of_original_type(_original_type), decoder, _parent->film_viewer()); + _text_view->Show (); } } @@ -469,10 +598,10 @@ TextPanel::fonts_dialog_clicked () _fonts_dialog = 0; } - ContentList c = _parent->selected_caption (); + ContentList c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - _fonts_dialog = new FontsDialog (this, c.front(), c.front()->caption_of_original_type(_original_type)); + _fonts_dialog = new FontsDialog (this, c.front(), c.front()->text_of_original_type(_original_type)); _fonts_dialog->Show (); } @@ -489,16 +618,16 @@ TextPanel::reference_clicked () return; } - d->set_reference_caption (_original_type, _reference->GetValue ()); + d->set_reference_text (_original_type, _reference->GetValue ()); } void TextPanel::appearance_dialog_clicked () { - ContentList c = _parent->selected_caption (); + ContentList c = _parent->selected_text (); DCPOMATIC_ASSERT (c.size() == 1); - SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, c.front(), c.front()->caption_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 (); }