X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=5bba1ec2ca006e681248f722a42d31edc1ddbcc0;hb=47c34c6c7c82396b62e101283cb25b8726dbaefd;hp=d82f9c028d7388af412e9956d3be68bea714b3b2;hpb=ea50f871993b76f733d5deb86a6004dc6bda3f0e;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index d82f9c028..5bba1ec2c 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; @@ -145,19 +144,19 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) _y_scale->SetRange (10, 1000); _line_spacing->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)); - _line_spacing->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::line_spacing_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)); + _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 @@ -224,6 +223,8 @@ SubtitlePanel::film_content_changed (int property) checked_set (_reference, false); } + setup_sensitivity (); + } else if (property == DCPContentProperty::HAS_SUBTITLES) { setup_sensitivity (); } } @@ -249,40 +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) { - DCPOMATIC_ASSERT (fc->subtitle_stream()); - /* 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; @@ -290,7 +275,7 @@ SubtitlePanel::setup_sensitivity () dcp = dynamic_pointer_cast (sel.front ()); } - list why_not; + string why_not; bool const can_reference = dcp && dcp->can_reference_subtitle (why_not); setup_refer_button (_reference, dcp, can_reference, why_not); @@ -299,16 +284,16 @@ 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 && text_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); + _subtitle_view_button->Enable (!reference); + _fonts_dialog_button->Enable (!reference); _appearance_dialog_button->Enable (!reference && any_subs > 0 && use); } @@ -410,7 +395,7 @@ SubtitlePanel::subtitle_view_clicked () ContentList c = _parent->selected_subtitle (); DCPOMATIC_ASSERT (c.size() == 1); - shared_ptr decoder = decoder_factory (c.front(), _parent->film()->log()); + shared_ptr decoder = decoder_factory (c.front(), _parent->film()->log(), false); if (decoder) { _subtitle_view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ()); @@ -455,38 +440,9 @@ SubtitlePanel::appearance_dialog_clicked () ContentList c = _parent->selected_subtitle (); DCPOMATIC_ASSERT (c.size() == 1); - bool text = false; - bool image = false; - - if ( - dynamic_pointer_cast (c.front()) || - dynamic_pointer_cast (c.front()) || - dynamic_pointer_cast (c.front())) { - - text = true; - } - - shared_ptr fc = dynamic_pointer_cast (c.front()); - if (fc) { - if (fc->subtitle_stream()->has_text()) { - text = true; - } else if (fc->subtitle_stream()->has_image()) { - image = true; - } - } - - if (text) { - TextSubtitleAppearanceDialog* d = new TextSubtitleAppearanceDialog (this, c.front()->subtitle); - if (d->ShowModal () == wxID_OK) { - d->apply (); - } - d->Destroy (); - } else if (image) { - 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 (); }