X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=21d6f8e5ba6c46a48a57004fa625e3a584af4641;hb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;hp=b4b5a7b4239e332ba55886cbcdcc3cd329d249df;hpb=854f2e5bbb7ffb9758b823af87034033033f3cb8;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index b4b5a7b42..21d6f8e5b 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -21,10 +21,15 @@ #include #include "lib/ffmpeg_content.h" #include "lib/subrip_content.h" +#include "lib/ffmpeg_subtitle_stream.h" +#include "lib/dcp_subtitle_content.h" +#include "lib/subrip_decoder.h" +#include "lib/dcp_subtitle_decoder.h" #include "subtitle_panel.h" #include "film_editor.h" #include "wx_util.h" #include "subtitle_view.h" +#include "content_panel.h" using std::vector; using std::string; @@ -32,19 +37,19 @@ using boost::shared_ptr; using boost::lexical_cast; using boost::dynamic_pointer_cast; -SubtitlePanel::SubtitlePanel (FilmEditor* e) - : FilmEditorPanel (e, _("Subtitles")) +SubtitlePanel::SubtitlePanel (ContentPanel* p) + : ContentSubPanel (p, _("Subtitles")) , _view (0) { wxFlexGridSizer* grid = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); _sizer->Add (grid, 0, wxALL, 8); - _with_subtitles = new wxCheckBox (this, wxID_ANY, _("With Subtitles")); - grid->Add (_with_subtitles, 1); + _use = new wxCheckBox (this, wxID_ANY, _("Use subtitles")); + grid->Add (_use); grid->AddSpacer (0); - + { - add_label_to_sizer (grid, this, _("Subtitle X Offset"), true); + add_label_to_sizer (grid, this, _("X Offset"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _x_offset = new wxSpinCtrl (this); s->Add (_x_offset); @@ -53,7 +58,7 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e) } { - add_label_to_sizer (grid, this, _("Subtitle Y Offset"), true); + add_label_to_sizer (grid, this, _("Y Offset"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _y_offset = new wxSpinCtrl (this); s->Add (_y_offset); @@ -62,15 +67,24 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e) } { - add_label_to_sizer (grid, this, _("Subtitle Scale"), true); + add_label_to_sizer (grid, this, _("X Scale"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _scale = new wxSpinCtrl (this); - s->Add (_scale); + _x_scale = new wxSpinCtrl (this); + s->Add (_x_scale); add_label_to_sizer (s, this, _("%"), false); grid->Add (s); } - add_label_to_sizer (grid, this, _("Subtitle Stream"), true); + { + add_label_to_sizer (grid, this, _("Y Scale"), true); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _y_scale = new wxSpinCtrl (this); + s->Add (_y_scale); + add_label_to_sizer (s, this, _("%"), false); + grid->Add (s); + } + + add_label_to_sizer (grid, this, _("Stream"), true); _stream = new wxChoice (this, wxID_ANY); grid->Add (_stream, 1, wxEXPAND); @@ -79,38 +93,31 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e) _x_offset->SetRange (-100, 100); _y_offset->SetRange (-100, 100); - _scale->SetRange (1, 1000); - _scale->SetValue (100); - - _with_subtitles->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::with_subtitles_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)); - _scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::scale_changed, this)); - _stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&SubtitlePanel::stream_changed, this)); - _view_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::view_clicked, this)); + _x_scale->SetRange (10, 1000); + _y_scale->SetRange (10, 1000); + + _use->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&SubtitlePanel::use_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)); + _stream->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&SubtitlePanel::stream_changed, this)); + _view_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::view_clicked, this)); } void SubtitlePanel::film_changed (Film::Property property) { - switch (property) { - case Film::CONTENT: - setup_sensitivity (); - break; - case Film::WITH_SUBTITLES: - checked_set (_with_subtitles, _editor->film()->with_subtitles ()); + if (property == Film::CONTENT) { setup_sensitivity (); - break; - default: - break; } } void SubtitlePanel::film_content_changed (int property) { - FFmpegContentList fc = _editor->selected_ffmpeg_content (); - SubtitleContentList sc = _editor->selected_subtitle_content (); + FFmpegContentList fc = _parent->selected_ffmpeg (); + SubtitleContentList sc = _parent->selected_subtitle (); shared_ptr fcs; if (fc.size() == 1) { @@ -121,7 +128,7 @@ SubtitlePanel::film_content_changed (int property) if (sc.size() == 1) { scs = sc.front (); } - + if (property == FFmpegContentProperty::SUBTITLE_STREAMS) { _stream->Clear (); if (fcs) { @@ -137,49 +144,68 @@ SubtitlePanel::film_content_changed (int property) } } setup_sensitivity (); + } else if (property == SubtitleContentProperty::USE_SUBTITLES) { + checked_set (_use, scs ? scs->use_subtitles() : false); + setup_sensitivity (); } else if (property == SubtitleContentProperty::SUBTITLE_X_OFFSET) { checked_set (_x_offset, scs ? (scs->subtitle_x_offset() * 100) : 0); } else if (property == SubtitleContentProperty::SUBTITLE_Y_OFFSET) { checked_set (_y_offset, scs ? (scs->subtitle_y_offset() * 100) : 0); - } else if (property == SubtitleContentProperty::SUBTITLE_SCALE) { - checked_set (_scale, scs ? (scs->subtitle_scale() * 100) : 100); + } else if (property == SubtitleContentProperty::SUBTITLE_X_SCALE) { + checked_set (_x_scale, scs ? int (rint (scs->subtitle_x_scale() * 100)) : 100); + } else if (property == SubtitleContentProperty::SUBTITLE_Y_SCALE) { + checked_set (_y_scale, scs ? int (rint (scs->subtitle_y_scale() * 100)) : 100); } } void -SubtitlePanel::with_subtitles_toggled () +SubtitlePanel::use_toggled () { - if (!_editor->film()) { - return; + SubtitleContentList c = _parent->selected_subtitle (); + for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { + (*i)->set_use_subtitles (_use->GetValue()); } - - _editor->film()->set_with_subtitles (_with_subtitles->GetValue ()); } void SubtitlePanel::setup_sensitivity () { - bool h = false; - bool j = false; - if (_editor->film()) { - h = _editor->film()->has_subtitles (); - j = _editor->film()->with_subtitles (); + int any_subs = 0; + int ffmpeg_subs = 0; + int subrip_or_dcp_subs = 0; + SubtitleContentList c = _parent->selected_subtitle (); + for (SubtitleContentList::const_iterator i = c.begin(); i != c.end(); ++i) { + shared_ptr fc = boost::dynamic_pointer_cast (*i); + shared_ptr sc = boost::dynamic_pointer_cast (*i); + shared_ptr dsc = boost::dynamic_pointer_cast (*i); + if (fc) { + if (fc->has_subtitles ()) { + ++ffmpeg_subs; + ++any_subs; + } + } else if (sc || dsc) { + ++subrip_or_dcp_subs; + ++any_subs; + } else { + ++any_subs; + } } + + _use->Enable (any_subs > 0); + bool const use = _use->GetValue (); - _with_subtitles->Enable (h); - _x_offset->Enable (j); - _y_offset->Enable (j); - _scale->Enable (j); - _stream->Enable (j); - - SubtitleContentList c = _editor->selected_subtitle_content (); - _view_button->Enable (c.size() == 1); + _x_offset->Enable (any_subs > 0 && use); + _y_offset->Enable (any_subs > 0 && use); + _x_scale->Enable (any_subs > 0 && use); + _y_scale->Enable (any_subs > 0 && use); + _stream->Enable (ffmpeg_subs == 1); + _view_button->Enable (subrip_or_dcp_subs == 1); } void SubtitlePanel::stream_changed () { - FFmpegContentList fc = _editor->selected_ffmpeg_content (); + FFmpegContentList fc = _parent->selected_ffmpeg (); if (fc.size() != 1) { return; } @@ -201,27 +227,36 @@ SubtitlePanel::stream_changed () void SubtitlePanel::x_offset_changed () { - SubtitleContentList c = _editor->selected_subtitle_content (); - if (c.size() == 1) { - c.front()->set_subtitle_x_offset (_x_offset->GetValue() / 100.0); + SubtitleContentList c = _parent->selected_subtitle (); + for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { + (*i)->set_subtitle_x_offset (_x_offset->GetValue() / 100.0); } } void SubtitlePanel::y_offset_changed () { - SubtitleContentList c = _editor->selected_subtitle_content (); - if (c.size() == 1) { - c.front()->set_subtitle_y_offset (_y_offset->GetValue() / 100.0); + SubtitleContentList c = _parent->selected_subtitle (); + for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { + (*i)->set_subtitle_y_offset (_y_offset->GetValue() / 100.0); } } void -SubtitlePanel::scale_changed () +SubtitlePanel::x_scale_changed () { - SubtitleContentList c = _editor->selected_subtitle_content (); + SubtitleContentList c = _parent->selected_subtitle (); if (c.size() == 1) { - c.front()->set_subtitle_scale (_scale->GetValue() / 100.0); + c.front()->set_subtitle_x_scale (_x_scale->GetValue() / 100.0); + } +} + +void +SubtitlePanel::y_scale_changed () +{ + SubtitleContentList c = _parent->selected_subtitle (); + for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { + (*i)->set_subtitle_y_scale (_y_scale->GetValue() / 100.0); } } @@ -229,9 +264,11 @@ void SubtitlePanel::content_selection_changed () { film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS); + film_content_changed (SubtitleContentProperty::USE_SUBTITLES); film_content_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET); film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET); - film_content_changed (SubtitleContentProperty::SUBTITLE_SCALE); + film_content_changed (SubtitleContentProperty::SUBTITLE_X_SCALE); + film_content_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE); } void @@ -242,12 +279,23 @@ SubtitlePanel::view_clicked () _view = 0; } - SubtitleContentList c = _editor->selected_subtitle_content (); + SubtitleContentList c = _parent->selected_subtitle (); assert (c.size() == 1); + + shared_ptr decoder; + shared_ptr sr = dynamic_pointer_cast (c.front ()); if (sr) { - _view = new SubtitleView (this, sr); + decoder.reset (new SubRipDecoder (sr)); + } + + shared_ptr dc = dynamic_pointer_cast (c.front ()); + if (dc) { + decoder.reset (new DCPSubtitleDecoder (dc)); + } + + if (decoder) { + _view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ()); + _view->Show (); } - - _view->Show (); }