X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=3198723a5a7806cd5a2be8f6124bff6d9cce27f9;hb=6bd8be029c72180a41d70e590bf2cb85a77317bf;hp=4b7f1ca534b594c24c9f01fa767ace32b9943258;hpb=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 4b7f1ca53..3198723a5 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -22,10 +22,14 @@ #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; @@ -33,8 +37,8 @@ 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); @@ -63,14 +67,27 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e) } { - add_label_to_sizer (grid, this, _("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, _("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, _("Language"), true); + _language = new wxTextCtrl (this, wxID_ANY); + grid->Add (_language, 1, wxEXPAND); + add_label_to_sizer (grid, this, _("Stream"), true); _stream = new wxChoice (this, wxID_ANY); grid->Add (_stream, 1, wxEXPAND); @@ -80,13 +97,15 @@ SubtitlePanel::SubtitlePanel (FilmEditor* e) _x_offset->SetRange (-100, 100); _y_offset->SetRange (-100, 100); - _scale->SetRange (1, 1000); - _scale->SetValue (100); + _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)); - _scale->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::scale_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)); _view_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&SubtitlePanel::view_clicked, this)); } @@ -102,8 +121,8 @@ SubtitlePanel::film_changed (Film::Property property) 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) { @@ -130,24 +149,28 @@ SubtitlePanel::film_content_changed (int property) } } setup_sensitivity (); - } else if (property == SubtitleContentProperty::SUBTITLE_USE) { - checked_set (_use, scs ? scs->subtitle_use() : false); + } 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); + } else if (property == SubtitleContentProperty::SUBTITLE_LANGUAGE) { + checked_set (_language, scs ? scs->subtitle_language() : ""); } } void SubtitlePanel::use_toggled () { - SubtitleContentList c = _editor->selected_subtitle_content (); + SubtitleContentList c = _parent->selected_subtitle (); for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { - (*i)->set_subtitle_use (_use->GetValue()); + (*i)->set_use_subtitles (_use->GetValue()); } } @@ -156,14 +179,20 @@ SubtitlePanel::setup_sensitivity () { int any_subs = 0; int ffmpeg_subs = 0; - SubtitleContentList c = _editor->selected_subtitle_content (); + 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->subtitle_streams().empty ()) { + if (fc->has_subtitles ()) { ++ffmpeg_subs; ++any_subs; } + } else if (sc || dsc) { + ++subrip_or_dcp_subs; + ++any_subs; } else { ++any_subs; } @@ -174,15 +203,17 @@ SubtitlePanel::setup_sensitivity () _x_offset->Enable (any_subs > 0 && use); _y_offset->Enable (any_subs > 0 && use); - _scale->Enable (any_subs > 0 && use); + _x_scale->Enable (any_subs > 0 && use); + _y_scale->Enable (any_subs > 0 && use); + _language->Enable (any_subs > 0 && use); _stream->Enable (ffmpeg_subs == 1); - _view_button->Enable (any_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; } @@ -204,7 +235,7 @@ SubtitlePanel::stream_changed () void SubtitlePanel::x_offset_changed () { - SubtitleContentList c = _editor->selected_subtitle_content (); + 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); } @@ -213,18 +244,36 @@ SubtitlePanel::x_offset_changed () void SubtitlePanel::y_offset_changed () { - SubtitleContentList c = _editor->selected_subtitle_content (); + 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 = _parent->selected_subtitle (); + if (c.size() == 1) { + c.front()->set_subtitle_x_scale (_x_scale->GetValue() / 100.0); + } +} + +void +SubtitlePanel::y_scale_changed () { - SubtitleContentList c = _editor->selected_subtitle_content (); + SubtitleContentList c = _parent->selected_subtitle (); for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { - (*i)->set_subtitle_scale (_scale->GetValue() / 100.0); + (*i)->set_subtitle_y_scale (_y_scale->GetValue() / 100.0); + } +} + +void +SubtitlePanel::language_changed () +{ + SubtitleContentList c = _parent->selected_subtitle (); + for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { + (*i)->set_subtitle_language (wx_to_std (_language->GetValue())); } } @@ -232,10 +281,12 @@ void SubtitlePanel::content_selection_changed () { film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS); - film_content_changed (SubtitleContentProperty::SUBTITLE_USE); + 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); + film_content_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE); } void @@ -246,12 +297,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, _editor->film(), 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 (); }