X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=3024617e56de9ddff76006632a2bf7eb158d25ee;hb=80400212e939dc2f3b987cb6df57709929aa5178;hp=21d6f8e5ba6c46a48a57004fa625e3a584af4641;hpb=3b48d5494c3cae7743d283203f5c8021860ab81f;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 21d6f8e5b..3024617e5 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 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 @@ -17,98 +17,139 @@ */ -#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" +#include "subtitle_appearance_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 +#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 (ContentPanel* p) : ContentSubPanel (p, _("Subtitles")) - , _view (0) + , _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); - grid->AddSpacer (0); + 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; { - add_label_to_sizer (grid, this, _("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, _("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); + 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); + grid->Add (s, wxGBPosition (r, 1)); + ++r; } { - add_label_to_sizer (grid, this, _("Y Scale"), true); + add_label_to_sizer (grid, this, _("Y Scale"), true, wxGBPosition (r, 0)); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _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, _("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); _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)); + _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) { - if (property == Film::CONTENT) { + if (property == Film::CONTENT || property == Film::REEL_TYPE) { setup_sensitivity (); } } @@ -136,7 +177,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 { @@ -147,23 +188,43 @@ SubtitlePanel::film_content_changed (int property) } else if (property == SubtitleContentProperty::USE_SUBTITLES) { checked_set (_use, scs ? scs->use_subtitles() : false); setup_sensitivity (); + } else if (property == SubtitleContentProperty::BURN_SUBTITLES) { + checked_set (_burn, scs ? scs->burn_subtitles() : false); } 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); + checked_set (_x_scale, scs ? lrint (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); + checked_set (_y_scale, scs ? lrint (scs->subtitle_y_scale() * 100) : 100); + } else if (property == SubtitleContentProperty::SUBTITLE_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::use_toggled () { - SubtitleContentList c = _parent->selected_subtitle (); - for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { - (*i)->set_use_subtitles (_use->GetValue()); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->set_use_subtitles (_use->GetValue()); + } +} + +void +SubtitlePanel::burn_toggled () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->set_burn_subtitles (_burn->GetValue()); } } @@ -172,34 +233,59 @@ SubtitlePanel::setup_sensitivity () { 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); + int text_subs = 0; + int dcp_subs = 0; + int image_subs = 0; + SubtitleContentList 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->has_subtitles ()) { ++ffmpeg_subs; ++any_subs; } - } else if (sc || dsc) { - ++subrip_or_dcp_subs; + } else if (sc) { + ++text_subs; + ++any_subs; + } else if (dsc) { + ++dcp_subs; ++any_subs; } else { ++any_subs; } + + if (i->has_image_subtitles ()) { + ++image_subs; + /* We must burn image subtitles at the moment */ + i->set_burn_subtitles (true); + } } - - _use->Enable (any_subs > 0); + + 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 (); - - _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); + _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 && text_subs == 1); } void @@ -211,7 +297,7 @@ SubtitlePanel::stream_changed () } 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 ())); @@ -227,18 +313,16 @@ SubtitlePanel::stream_changed () void SubtitlePanel::x_offset_changed () { - 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); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->set_subtitle_x_offset (_x_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); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->set_subtitle_y_offset (_y_offset->GetValue() / 100.0); } } @@ -254,9 +338,16 @@ SubtitlePanel::x_scale_changed () 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); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->set_subtitle_y_scale (_y_scale->GetValue() / 100.0); + } +} + +void +SubtitlePanel::language_changed () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->set_subtitle_language (wx_to_std (_language->GetValue())); } } @@ -265,37 +356,88 @@ SubtitlePanel::content_selection_changed () { film_content_changed (FFmpegContentProperty::SUBTITLE_STREAMS); film_content_changed (SubtitleContentProperty::USE_SUBTITLES); + film_content_changed (SubtitleContentProperty::BURN_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); + 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 = _parent->selected_subtitle (); - assert (c.size() == 1); + DCPOMATIC_ASSERT (c.size() == 1); shared_ptr decoder; - - shared_ptr sr = dynamic_pointer_cast (c.front ()); + + shared_ptr sr = dynamic_pointer_cast (c.front ()); if (sr) { - decoder.reset (new SubRipDecoder (sr)); + decoder.reset (new TextSubtitleDecoder (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 (); + _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 (); +} + +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 () +{ + SubtitleContentList c = _parent->selected_subtitle (); + DCPOMATIC_ASSERT (c.size() == 1); + + shared_ptr sr = dynamic_pointer_cast (c.front ()); + DCPOMATIC_ASSERT (sr); + + SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, sr); + if (d->ShowModal () == wxID_OK) { + d->apply (); } + d->Destroy (); }