X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=d99b545587393104aeb1f0731d1a8b0f3b3ebd42;hb=1d68fe1e3ad1a9aa85fa7fc6071a0b8c64973953;hp=fecc85106f6f889d5a1bd725ac10978022bae7ac;hpb=f4030653da8f5a0b3daebe640f485b3daf9ef091;p=dcpomatic.git diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index fecc85106..d99b54558 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,19 +17,21 @@ */ -#include -#include +#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 "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 +#include +#include using std::vector; using std::string; @@ -39,7 +41,8 @@ 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); _sizer->Add (grid, 0, wxALL, 8); @@ -48,6 +51,10 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) grid->Add (_use); grid->AddSpacer (0); + _burn = new wxCheckBox (this, wxID_ANY, _("Burn subtitles into image")); + grid->Add (_burn); + grid->AddSpacer (0); + { add_label_to_sizer (grid, this, _("X Offset"), true); wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); @@ -65,34 +72,56 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) add_label_to_sizer (s, this, _("%"), false); grid->Add (s); } - + { - 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); - _view_button = new wxButton (this, wxID_ANY, _("View...")); - grid->Add (_view_button); - + _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); - _scale->SetRange (1, 1000); - _scale->SetValue (100); - - _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)); - _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)); + _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)); } void @@ -126,7 +155,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 { @@ -137,12 +166,18 @@ 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_SCALE) { - checked_set (_scale, scs ? (scs->subtitle_scale() * 100) : 100); + } else if (property == SubtitleContentProperty::SUBTITLE_X_SCALE) { + checked_set (_x_scale, scs ? lrint (scs->subtitle_x_scale() * 100) : 100); + } else if (property == SubtitleContentProperty::SUBTITLE_Y_SCALE) { + 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() : ""); } } @@ -155,17 +190,26 @@ SubtitlePanel::use_toggled () } } +void +SubtitlePanel::burn_toggled () +{ + SubtitleContentList c = _parent->selected_subtitle (); + for (SubtitleContentList::iterator i = c.begin(); i != c.end(); ++i) { + (*i)->set_burn_subtitles (_burn->GetValue()); + } +} + void 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 image_subs = 0; + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + 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; @@ -177,16 +221,25 @@ SubtitlePanel::setup_sensitivity () } 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); bool const use = _use->GetValue (); - + _burn->Enable (any_subs > 0 && use && image_subs == 0); _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 (subrip_or_dcp_subs == 1); + _subtitle_view_button->Enable (subrip_or_dcp_subs == 1); + _fonts_dialog_button->Enable (subrip_or_dcp_subs == 1); } void @@ -198,7 +251,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 ())); @@ -230,11 +283,29 @@ SubtitlePanel::y_offset_changed () } 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 = _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())); } } @@ -243,36 +314,55 @@ 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_SCALE); + 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::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 ()); if (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 (); + _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 (); +}