X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=31b4e96ac3cf8083809d0a41af5d9ec6a8b75362;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=aa3d3a73547757de1ac2a01537ada723597305f5;hpb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index aa3d3a735..31b4e96ac 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -1,128 +1,176 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include -#include "lib/ffmpeg_content.h" -#include "lib/subrip_content.h" -#include "lib/ffmpeg_subtitle_stream.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" +#include "text_subtitle_appearance_dialog.h" +#include "image_subtitle_colour_dialog.h" +#include "lib/ffmpeg_content.h" +#include "lib/text_subtitle_content.h" +#include "lib/ffmpeg_subtitle_stream.h" +#include "lib/dcp_subtitle_content.h" +#include "lib/text_subtitle_decoder.h" +#include "lib/dcp_subtitle_decoder.h" +#include "lib/dcp_content.h" +#include "lib/subtitle_content.h" +#include +#include using std::vector; using std::string; +using std::list; using boost::shared_ptr; -using boost::lexical_cast; using boost::dynamic_pointer_cast; -SubtitlePanel::SubtitlePanel (FilmEditor* e) - : FilmEditorPanel (e, _("Subtitles")) - , _view (0) +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); + wxGridBagSizer* grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); _sizer->Add (grid, 0, wxALL, 8); + int r = 0; + + _reference = new wxCheckBox (this, wxID_ANY, _("Refer to existing DCP")); + grid->Add (_reference, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + + _use = new wxCheckBox (this, wxID_ANY, _("Use subtitles")); + grid->Add (_use, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + + _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image")); + grid->Add (_burn, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; - _with_subtitles = new wxCheckBox (this, wxID_ANY, _("With Subtitles")); - grid->Add (_with_subtitles, 1); - grid->AddSpacer (0); - { - add_label_to_sizer (grid, this, _("Subtitle X Offset"), true); + add_label_to_sizer (grid, this, _("X Offset"), true, wxGBPosition (r, 0)); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _x_offset = new wxSpinCtrl (this); s->Add (_x_offset); add_label_to_sizer (s, this, _("%"), false); - grid->Add (s); + grid->Add (s, wxGBPosition (r, 1)); + ++r; } { - add_label_to_sizer (grid, this, _("Subtitle Y Offset"), true); + add_label_to_sizer (grid, this, _("Y Offset"), true, wxGBPosition (r, 0)); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _y_offset = new wxSpinCtrl (this); s->Add (_y_offset); add_label_to_sizer (s, this, _("%"), false); - grid->Add (s); + grid->Add (s, wxGBPosition (r, 1)); + ++r; + } + + { + add_label_to_sizer (grid, this, _("X Scale"), true, wxGBPosition (r, 0)); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _x_scale = new wxSpinCtrl (this); + s->Add (_x_scale); + add_label_to_sizer (s, this, _("%"), false); + grid->Add (s, wxGBPosition (r, 1)); + ++r; } - + { - add_label_to_sizer (grid, this, _("Subtitle Scale"), true); + add_label_to_sizer (grid, this, _("Y Scale"), true, wxGBPosition (r, 0)); 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); + grid->Add (s, wxGBPosition (r, 1)); + ++r; } - add_label_to_sizer (grid, this, _("Subtitle Stream"), true); + add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0)); + _language = new wxTextCtrl (this, wxID_ANY); + grid->Add (_language, wxGBPosition (r, 1)); + ++r; + + add_label_to_sizer (grid, this, _("Stream"), true, wxGBPosition (r, 0)); _stream = new wxChoice (this, wxID_ANY); - grid->Add (_stream, 1, wxEXPAND); + grid->Add (_stream, wxGBPosition (r, 1)); + ++r; + + { + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + + _subtitle_view_button = new wxButton (this, wxID_ANY, _("View...")); + s->Add (_subtitle_view_button, 1, wxALL, DCPOMATIC_SIZER_GAP); + _fonts_dialog_button = new wxButton (this, wxID_ANY, _("Fonts...")); + s->Add (_fonts_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); + _appearance_dialog_button = new wxButton (this, wxID_ANY, _("Appearance...")); + s->Add (_appearance_dialog_button, 1, wxALL, DCPOMATIC_SIZER_GAP); + + grid->Add (s, wxGBPosition (r, 0), wxGBSpan (1, 2)); + ++r; + } - _view_button = new wxButton (this, wxID_ANY, _("View...")); - grid->Add (_view_button); - _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); - _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)); + _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)); } 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 || property == Film::REEL_TYPE) { 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 (); + ContentList sc = _parent->selected_subtitle (); shared_ptr fcs; if (fc.size() == 1) { fcs = fc.front (); } - shared_ptr scs; + shared_ptr scs; if (sc.size() == 1) { scs = sc.front (); } - + if (property == FFmpegContentProperty::SUBTITLE_STREAMS) { _stream->Clear (); if (fcs) { @@ -130,7 +178,7 @@ SubtitlePanel::film_content_changed (int property) for (vector >::iterator i = s.begin(); i != s.end(); ++i) { _stream->Append (std_to_wx ((*i)->name), new wxStringClientData (std_to_wx ((*i)->identifier ()))); } - + if (fcs->subtitle_stream()) { checked_set (_stream, fcs->subtitle_stream()->identifier ()); } else { @@ -138,55 +186,119 @@ SubtitlePanel::film_content_changed (int property) } } 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::USE) { + checked_set (_use, scs ? scs->subtitle->use() : false); + setup_sensitivity (); + } else if (property == SubtitleContentProperty::BURN) { + checked_set (_burn, scs ? scs->subtitle->burn() : false); + } else if (property == SubtitleContentProperty::X_OFFSET) { + checked_set (_x_offset, scs ? lrint (scs->subtitle->x_offset() * 100) : 0); + } else if (property == SubtitleContentProperty::Y_OFFSET) { + checked_set (_y_offset, scs ? lrint (scs->subtitle->y_offset() * 100) : 0); + } else if (property == SubtitleContentProperty::X_SCALE) { + 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::LANGUAGE) { + checked_set (_language, scs ? scs->subtitle->language() : ""); + } else if (property == DCPContentProperty::REFERENCE_SUBTITLE) { + if (scs) { + shared_ptr dcp = dynamic_pointer_cast (scs); + checked_set (_reference, dcp ? dcp->reference_subtitle () : false); + } else { + checked_set (_reference, false); + } + + setup_sensitivity (); } } void -SubtitlePanel::with_subtitles_toggled () +SubtitlePanel::use_toggled () { - if (!_editor->film()) { - return; + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_use (_use->GetValue()); } +} - _editor->film()->set_with_subtitles (_with_subtitles->GetValue ()); +void +SubtitlePanel::burn_toggled () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_burn (_burn->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 text_subs = 0; + int dcp_subs = 0; + int image_subs = 0; + ContentList sel = _parent->selected_subtitle (); + BOOST_FOREACH (shared_ptr i, sel) { + 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) { + ++ffmpeg_subs; + ++any_subs; + } + } else if (sc) { + ++text_subs; + ++any_subs; + } else if (dsc) { + ++dcp_subs; + ++any_subs; + } else { + ++any_subs; + } + + if (i->subtitle->has_image_subtitles ()) { + ++image_subs; + /* We must burn image subtitles at the moment */ + i->subtitle->set_burn (true); + } } - - _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); + shared_ptr dcp; + if (sel.size() == 1) { + dcp = dynamic_pointer_cast (sel.front ()); + } + + list why_not; + bool const can_reference = dcp && dcp->can_reference_subtitle (why_not); + setup_refer_button (_reference, dcp, can_reference, why_not); + + bool const reference = _reference->GetValue (); + + _use->Enable (!reference && any_subs > 0); + bool const use = _use->GetValue (); + _burn->Enable (!reference && any_subs > 0 && use && image_subs == 0); + _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); + _language->Enable (!reference && any_subs > 0 && use); + _stream->Enable (!reference && ffmpeg_subs == 1); + _subtitle_view_button->Enable (!reference && (text_subs == 1 || dcp_subs == 1)); + _fonts_dialog_button->Enable (!reference && (text_subs == 1 || dcp_subs == 1)); + _appearance_dialog_button->Enable (!reference && (ffmpeg_subs == 1 || text_subs == 1)); } void SubtitlePanel::stream_changed () { - FFmpegContentList fc = _editor->selected_ffmpeg_content (); + FFmpegContentList fc = _parent->selected_ffmpeg (); if (fc.size() != 1) { return; } 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 ())); @@ -202,27 +314,41 @@ 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); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_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); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_y_offset (_y_offset->GetValue() / 100.0); } } void -SubtitlePanel::scale_changed () +SubtitlePanel::x_scale_changed () { - SubtitleContentList c = _editor->selected_subtitle_content (); + ContentList c = _parent->selected_subtitle (); if (c.size() == 1) { - c.front()->set_subtitle_scale (_scale->GetValue() / 100.0); + c.front()->subtitle->set_x_scale (_x_scale->GetValue() / 100.0); + } +} + +void +SubtitlePanel::y_scale_changed () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_y_scale (_y_scale->GetValue() / 100.0); + } +} + +void +SubtitlePanel::language_changed () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_language (wx_to_std (_language->GetValue())); } } @@ -230,25 +356,97 @@ void SubtitlePanel::content_selection_changed () { film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS); - film_content_changed (SubtitleContentProperty::SUBTITLE_X_OFFSET); - film_content_changed (SubtitleContentProperty::SUBTITLE_Y_OFFSET); - film_content_changed (SubtitleContentProperty::SUBTITLE_SCALE); + film_content_changed (SubtitleContentProperty::USE); + film_content_changed (SubtitleContentProperty::BURN); + film_content_changed (SubtitleContentProperty::X_OFFSET); + film_content_changed (SubtitleContentProperty::Y_OFFSET); + film_content_changed (SubtitleContentProperty::X_SCALE); + film_content_changed (SubtitleContentProperty::Y_SCALE); + film_content_changed (SubtitleContentProperty::LANGUAGE); + film_content_changed (SubtitleContentProperty::FONTS); + film_content_changed (DCPContentProperty::REFERENCE_SUBTITLE); } void -SubtitlePanel::view_clicked () +SubtitlePanel::subtitle_view_clicked () { - if (_view) { - _view->Destroy (); - _view = 0; + if (_subtitle_view) { + _subtitle_view->Destroy (); + _subtitle_view = 0; } - SubtitleContentList c = _editor->selected_subtitle_content (); - assert (c.size() == 1); - shared_ptr sr = dynamic_pointer_cast (c.front ()); + ContentList c = _parent->selected_subtitle (); + DCPOMATIC_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 TextSubtitleDecoder (sr)); } - _view->Show (); + shared_ptr dc = dynamic_pointer_cast (c.front ()); + if (dc) { + decoder.reset (new DCPSubtitleDecoder (dc)); + } + + 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; + } + + ContentList c = _parent->selected_subtitle (); + DCPOMATIC_ASSERT (c.size() == 1); + + _fonts_dialog = new FontsDialog (this, c.front ()); + _fonts_dialog->Show (); +} + +void +SubtitlePanel::reference_clicked () +{ + ContentList c = _parent->selected (); + if (c.size() != 1) { + return; + } + + shared_ptr d = dynamic_pointer_cast (c.front ()); + if (!d) { + return; + } + + d->set_reference_subtitle (_reference->GetValue ()); +} + +void +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 (); + } }