X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=0b94b335fd9c4adbf1cf37be0f685b34e7119e74;hb=d7880690e9e6dba3c82cd0e78e32862a1ec43666;hp=31ee2c4777686f9a172c6d676516824510595716;hpb=b0f078d851e2a84d2f9d2ae085f6aad837747eb1;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 31ee2c477..0b94b335f 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -24,8 +24,7 @@ #include "subtitle_view.h" #include "content_panel.h" #include "fonts_dialog.h" -#include "text_subtitle_appearance_dialog.h" -#include "image_subtitle_colour_dialog.h" +#include "subtitle_appearance_dialog.h" #include "lib/ffmpeg_content.h" #include "lib/text_subtitle_content.h" #include "lib/ffmpeg_subtitle_stream.h" @@ -53,7 +52,7 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) _sizer->Add (grid, 0, wxALL, 8); int r = 0; - _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP")); + _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's subtitle as OV and make VF")); grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -105,6 +104,16 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) ++r; } + { + 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; + } + add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0)); _language = new wxTextCtrl (this, wxID_ANY); grid->Add (_language, wxGBPosition (r, 1)); @@ -133,19 +142,21 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) _y_offset->SetRange (-100, 100); _x_scale->SetRange (10, 1000); _y_scale->SetRange (10, 1000); - - _reference->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::reference_clicked, this)); - _use->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::use_toggled, this)); - _burn->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::burn_toggled, this)); - _x_offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_offset_changed, this)); - _y_offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_offset_changed, this)); - _x_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::x_scale_changed, this)); - _y_scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::y_scale_changed, this)); - _language->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&SubtitlePanel::language_changed, this)); - _stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&SubtitlePanel::stream_changed, this)); - _subtitle_view_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::subtitle_view_clicked, this)); - _fonts_dialog_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::fonts_dialog_clicked, this)); - _appearance_dialog_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::appearance_dialog_clicked, this)); + _line_spacing->SetRange (10, 1000); + + _reference->Bind (wxEVT_CHECKBOX, boost::bind (&SubtitlePanel::reference_clicked, this)); + _use->Bind (wxEVT_CHECKBOX, boost::bind (&SubtitlePanel::use_toggled, this)); + _burn->Bind (wxEVT_CHECKBOX, boost::bind (&SubtitlePanel::burn_toggled, this)); + _x_offset->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::x_offset_changed, this)); + _y_offset->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::y_offset_changed, this)); + _x_scale->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::x_scale_changed, this)); + _y_scale->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::y_scale_changed, this)); + _line_spacing->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::line_spacing_changed, this)); + _language->Bind (wxEVT_TEXT, boost::bind (&SubtitlePanel::language_changed, this)); + _stream->Bind (wxEVT_CHOICE, boost::bind (&SubtitlePanel::stream_changed, this)); + _subtitle_view_button->Bind (wxEVT_BUTTON, boost::bind (&SubtitlePanel::subtitle_view_clicked, this)); + _fonts_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&SubtitlePanel::fonts_dialog_clicked, this)); + _appearance_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&SubtitlePanel::appearance_dialog_clicked, this)); } void @@ -200,6 +211,8 @@ SubtitlePanel::film_content_changed (int property) checked_set (_x_scale, scs ? lrint (scs->subtitle->x_scale() * 100) : 100); } else if (property == SubtitleContentProperty::Y_SCALE) { checked_set (_y_scale, scs ? lrint (scs->subtitle->y_scale() * 100) : 100); + } else if (property == SubtitleContentProperty::LINE_SPACING) { + checked_set (_line_spacing, scs ? lrint (scs->subtitle->line_spacing() * 100) : 100); } else if (property == SubtitleContentProperty::LANGUAGE) { checked_set (_language, scs ? scs->subtitle->language() : ""); } else if (property == DCPContentProperty::REFERENCE_SUBTITLE) { @@ -210,6 +223,8 @@ SubtitlePanel::film_content_changed (int property) checked_set (_reference, false); } + setup_sensitivity (); + } else if (property == DCPContentProperty::HAS_SUBTITLES) { setup_sensitivity (); } } @@ -235,39 +250,24 @@ SubtitlePanel::setup_sensitivity () { int any_subs = 0; int ffmpeg_subs = 0; - int text_subs = 0; - int image_subs = 0; ContentList sel = _parent->selected_subtitle (); BOOST_FOREACH (shared_ptr 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); if (fc) { if (fc->subtitle) { - /* This content has some subtitles; check the selected stream to decide what type */ - if (fc->subtitle_stream()->has_text()) { - ++text_subs; - } else if (fc->subtitle_stream()->has_image()) { - ++image_subs; - } ++ffmpeg_subs; ++any_subs; } - } else if (sc || dsc) { + } else if (sc || dc || dsc) { /* XXX: in the future there could be bitmap subs from DCPs */ - ++text_subs; ++any_subs; } } - if (image_subs) { - BOOST_FOREACH (shared_ptr i, sel) { - /* We must burn image subtitles at the moment */ - i->subtitle->set_burn (true); - } - } - /* Decide whether we can reference these subs */ shared_ptr dcp; @@ -284,16 +284,17 @@ SubtitlePanel::setup_sensitivity () /* Set up sensitivity */ _use->Enable (!reference && any_subs > 0); bool const use = _use->GetValue (); - _burn->Enable (!reference && any_subs > 0 && use && image_subs == 0); + _burn->Enable (!reference && any_subs > 0 && use); _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); _stream->Enable (!reference && ffmpeg_subs == 1); - _subtitle_view_button->Enable (!reference && text_subs == 1); - _fonts_dialog_button->Enable (!reference && text_subs == 1); - _appearance_dialog_button->Enable (!reference); + _subtitle_view_button->Enable (!reference); + _fonts_dialog_button->Enable (!reference); + _appearance_dialog_button->Enable (!reference && any_subs > 0 && use); } void @@ -351,6 +352,14 @@ SubtitlePanel::y_scale_changed () } } +void +SubtitlePanel::line_spacing_changed () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_line_spacing (_line_spacing->GetValue() / 100.0); + } +} + void SubtitlePanel::language_changed () { @@ -369,6 +378,7 @@ SubtitlePanel::content_selection_changed () film_content_changed (SubtitleContentProperty::Y_OFFSET); film_content_changed (SubtitleContentProperty::X_SCALE); film_content_changed (SubtitleContentProperty::Y_SCALE); + film_content_changed (SubtitleContentProperty::LINE_SPACING); film_content_changed (SubtitleContentProperty::LANGUAGE); film_content_changed (SubtitleContentProperty::FONTS); film_content_changed (DCPContentProperty::REFERENCE_SUBTITLE); @@ -385,8 +395,7 @@ SubtitlePanel::subtitle_view_clicked () ContentList c = _parent->selected_subtitle (); DCPOMATIC_ASSERT (c.size() == 1); - list > image_decoders; - shared_ptr decoder = decoder_factory (c.front(), image_decoders, _parent->film()->log(), false); + shared_ptr decoder = decoder_factory (c.front(), _parent->film()->log(), false); if (decoder) { _subtitle_view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ()); @@ -431,20 +440,9 @@ SubtitlePanel::appearance_dialog_clicked () ContentList c = _parent->selected_subtitle (); DCPOMATIC_ASSERT (c.size() == 1); - shared_ptr sr = dynamic_pointer_cast (c.front ()); - if (sr) { - TextSubtitleAppearanceDialog* d = new TextSubtitleAppearanceDialog (this, sr); - if (d->ShowModal () == wxID_OK) { - d->apply (); - } - d->Destroy (); - } else { - shared_ptr fc = dynamic_pointer_cast (c.front ()); - DCPOMATIC_ASSERT (fc); - ImageSubtitleColourDialog* d = new ImageSubtitleColourDialog (this, fc, fc->subtitle_stream ()); - if (d->ShowModal() == wxID_OK) { - d->apply (); - } - d->Destroy (); + SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, c.front()); + if (d->ShowModal () == wxID_OK) { + d->apply (); } + d->Destroy (); }