X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=9823df7a753606b43774080bac9f60b846cdeb1b;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=8f2b08af51dd263dce782f3164c81a41566d8113;hpb=9a9f2cf479127bf9b3eff726f4f73103acae9b85;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 8f2b08af5..9823df7a7 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,9 +20,17 @@ #include #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" +#include "fonts_dialog.h" using std::vector; using std::string; @@ -30,163 +38,307 @@ 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")) + , _subtitle_view (0) + , _fonts_dialog (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, _("X Offset"), true); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _x_offset = new wxSpinCtrl (this); + s->Add (_x_offset); + add_label_to_sizer (s, this, _("%"), false); + grid->Add (s); + } + + { + add_label_to_sizer (grid, this, _("Y Offset"), true); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _y_offset = new wxSpinCtrl (this); + s->Add (_y_offset); + add_label_to_sizer (s, this, _("%"), false); + grid->Add (s); + } + { - add_label_to_sizer (grid, this, _("Subtitle Offset"), true); + add_label_to_sizer (grid, this, _("X Scale"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _offset = new wxSpinCtrl (this); - s->Add (_offset); + _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 Scale"), true); + add_label_to_sizer (grid, this, _("Y Scale"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); - _scale = new wxSpinCtrl (this); - s->Add (_scale); + _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, _("Subtitle Stream"), true); + 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); - - _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)); - _offset->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&SubtitlePanel::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)); + + _subtitle_view_button = new wxButton (this, wxID_ANY, _("View...")); + grid->Add (_subtitle_view_button); + grid->AddSpacer (0); + + _fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts...")); + grid->Add (_fonts_dialog_button); + grid->AddSpacer (0); + + _x_offset->SetRange (-100, 100); + _y_offset->SetRange (-100, 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)); + _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)); } void SubtitlePanel::film_changed (Film::Property property) { - switch (property) { - case Film::CONTENT: + if (property == Film::CONTENT) { setup_sensitivity (); - break; - case Film::WITH_SUBTITLES: - checked_set (_with_subtitles, _editor->film()->with_subtitles ()); - setup_sensitivity (); - break; - default: - break; } } void -SubtitlePanel::film_content_changed (shared_ptr c, int property) +SubtitlePanel::film_content_changed (int property) { - shared_ptr sc = dynamic_pointer_cast (c); - shared_ptr fc = dynamic_pointer_cast (c); - + FFmpegContentList fc = _parent->selected_ffmpeg (); + SubtitleContentList sc = _parent->selected_subtitle (); + + shared_ptr fcs; + if (fc.size() == 1) { + fcs = fc.front (); + } + + shared_ptr scs; + if (sc.size() == 1) { + scs = sc.front (); + } + if (property == FFmpegContentProperty::SUBTITLE_STREAMS) { _stream->Clear (); - if (fc) { - vector > s = fc->subtitle_streams (); + if (fcs) { + vector > s = fcs->subtitle_streams (); for (vector >::iterator i = s.begin(); i != s.end(); ++i) { - _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx (lexical_cast ((*i)->id)))); + _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ()))); } - - if (fc->subtitle_stream()) { - checked_set (_stream, lexical_cast (fc->subtitle_stream()->id)); + + if (fcs->subtitle_stream()) { + checked_set (_stream, fcs->subtitle_stream()->identifier ()); } else { _stream->SetSelection (wxNOT_FOUND); } } setup_sensitivity (); - } else if (property == SubtitleContentProperty::SUBTITLE_OFFSET) { - checked_set (_offset, sc ? (sc->subtitle_offset() * 100) : 0); - } else if (property == SubtitleContentProperty::SUBTITLE_SCALE) { - checked_set (_scale, sc ? (sc->subtitle_scale() * 100) : 100); + } 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_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::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 (); - } - - _with_subtitles->Enable (h); - _offset->Enable (j); - _scale->Enable (j); - _stream->Enable (j); + 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 (); + + _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); + _language->Enable (any_subs > 0 && use); + _stream->Enable (ffmpeg_subs == 1); + _subtitle_view_button->Enable (subrip_or_dcp_subs == 1); + _fonts_dialog_button->Enable (subrip_or_dcp_subs == 1); } void SubtitlePanel::stream_changed () { - shared_ptr c = _editor->selected_content (); - if (!c) { - return; - } - - shared_ptr fc = dynamic_pointer_cast (c); - if (!fc) { + FFmpegContentList fc = _parent->selected_ffmpeg (); + if (fc.size() != 1) { return; } - - vector > a = fc->subtitle_streams (); + + shared_ptr fcs = fc.front (); + + vector > a = fcs->subtitle_streams (); vector >::iterator i = a.begin (); string const s = string_client_data (_stream->GetClientObject (_stream->GetSelection ())); - while (i != a.end() && lexical_cast ((*i)->id) != s) { + while (i != a.end() && (*i)->identifier () != s) { ++i; } if (i != a.end ()) { - fc->set_subtitle_stream (*i); + fcs->set_subtitle_stream (*i); } } void -SubtitlePanel::offset_changed () +SubtitlePanel::x_offset_changed () { - shared_ptr c = _editor->selected_subtitle_content (); - if (!c) { - return; + 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); } +} - c->set_subtitle_offset (_offset->GetValue() / 100.0); +void +SubtitlePanel::y_offset_changed () +{ + 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 () { - shared_ptr c = _editor->selected_subtitle_content (); - if (!c) { - return; + 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 = _parent->selected_subtitle (); + for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { + (*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())); + } +} + +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_X_SCALE); + film_content_changed (SubtitleContentProperty::SUBTITLE_Y_SCALE); + film_content_changed (SubtitleContentProperty::SUBTITLE_LANGUAGE); + film_content_changed (SubtitleContentProperty::FONTS); +} + +void +SubtitlePanel::subtitle_view_clicked () +{ + if (_subtitle_view) { + _subtitle_view->Destroy (); + _subtitle_view = 0; + } + + SubtitleContentList c = _parent->selected_subtitle (); + DCPOMATIC_ASSERT (c.size() == 1); + + shared_ptr decoder; + + shared_ptr sr = dynamic_pointer_cast (c.front ()); + if (sr) { + decoder.reset (new SubRipDecoder (sr)); + } + + shared_ptr dc = dynamic_pointer_cast (c.front ()); + if (dc) { + decoder.reset (new DCPSubtitleDecoder (dc)); } - c->set_subtitle_scale (_scale->GetValue() / 100.0); + if (decoder) { + _subtitle_view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ()); + _subtitle_view->Show (); + } } +void +SubtitlePanel::fonts_dialog_clicked () +{ + if (_fonts_dialog) { + _fonts_dialog->Destroy (); + _fonts_dialog = 0; + } + + SubtitleContentList c = _parent->selected_subtitle (); + DCPOMATIC_ASSERT (c.size() == 1); + + _fonts_dialog = new FontsDialog (this, c.front ()); + _fonts_dialog->Show (); +}