X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=da7891ca8eb1f41d44acd6f4594340dbbc6f550a;hp=ad6a024e6682ed2193597641deedf4a4711ccba2;hb=d7ac100c0eb1b5efdcfbec59be870fd869252840;hpb=a314c58874f905bd1812c77ee6c78cb71de0a62e diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index ad6a024e6..da7891ca8 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2012-2015 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 . */ @@ -23,15 +24,16 @@ #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 "subtitle_appearance_dialog.h" #include "lib/ffmpeg_content.h" -#include "lib/text_subtitle_content.h" +#include "lib/text_text_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_text_content.h" +#include "lib/text_text_decoder.h" +#include "lib/dcp_text_decoder.h" #include "lib/dcp_content.h" +#include "lib/text_content.h" +#include "lib/decoder_factory.h" #include #include @@ -46,14 +48,25 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) , _subtitle_view (0) , _fonts_dialog (0) { + wxBoxSizer* reference_sizer = new wxBoxSizer (wxVERTICAL); + + _reference = new wxCheckBox (this, wxID_ANY, _("Use this DCP's subtitle as OV and make VF")); + reference_sizer->Add (_reference, 0, wxLEFT | wxRIGHT | wxTOP, DCPOMATIC_SIZER_GAP); + + _reference_note = new wxStaticText (this, wxID_ANY, _("")); + _reference_note->Wrap (200); + reference_sizer->Add (_reference_note, 0, wxLEFT | wxRIGHT, DCPOMATIC_SIZER_GAP); + wxFont font = _reference_note->GetFont(); + font.SetStyle(wxFONTSTYLE_ITALIC); + font.SetPointSize(font.GetPointSize() - 1); + _reference_note->SetFont(font); + + _sizer->Add (reference_sizer); + 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; @@ -102,6 +115,16 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) ++r; } + { + add_label_to_sizer (grid, this, _("Line spacing"), true, wxGBPosition (r, 0)); + wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + _line_spacing = new wxSpinCtrl (this); + s->Add (_line_spacing); + add_label_to_sizer (s, this, _("%"), false); + grid->Add (s, wxGBPosition (r, 1)); + ++r; + } + add_label_to_sizer (grid, this, _("Language"), true, wxGBPosition (r, 0)); _language = new wxTextCtrl (this, wxID_ANY); grid->Add (_language, wxGBPosition (r, 1)); @@ -130,19 +153,21 @@ SubtitlePanel::SubtitlePanel (ContentPanel* p) _y_offset->SetRange (-100, 100); _x_scale->SetRange (10, 1000); _y_scale->SetRange (10, 1000); - - _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)); + _line_spacing->SetRange (10, 1000); + + _reference->Bind (wxEVT_CHECKBOX, boost::bind (&SubtitlePanel::reference_clicked, this)); + _use->Bind (wxEVT_CHECKBOX, boost::bind (&SubtitlePanel::use_toggled, this)); + _burn->Bind (wxEVT_CHECKBOX, boost::bind (&SubtitlePanel::burn_toggled, this)); + _x_offset->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::x_offset_changed, this)); + _y_offset->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::y_offset_changed, this)); + _x_scale->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::x_scale_changed, this)); + _y_scale->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::y_scale_changed, this)); + _line_spacing->Bind (wxEVT_SPINCTRL, boost::bind (&SubtitlePanel::line_spacing_changed, this)); + _language->Bind (wxEVT_TEXT, boost::bind (&SubtitlePanel::language_changed, this)); + _stream->Bind (wxEVT_CHOICE, boost::bind (&SubtitlePanel::stream_changed, this)); + _subtitle_view_button->Bind (wxEVT_BUTTON, boost::bind (&SubtitlePanel::subtitle_view_clicked, this)); + _fonts_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&SubtitlePanel::fonts_dialog_clicked, this)); + _appearance_dialog_button->Bind (wxEVT_BUTTON, boost::bind (&SubtitlePanel::appearance_dialog_clicked, this)); } void @@ -157,14 +182,14 @@ void SubtitlePanel::film_content_changed (int property) { FFmpegContentList fc = _parent->selected_ffmpeg (); - SubtitleContentList sc = _parent->selected_subtitle (); + 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 (); } @@ -184,21 +209,23 @@ SubtitlePanel::film_content_changed (int property) } } setup_sensitivity (); - } else if (property == SubtitleContentProperty::USE_SUBTITLES) { - checked_set (_use, scs ? scs->use_subtitles() : false); + } else if (property == TextContentProperty::USE) { + checked_set (_use, scs ? scs->subtitle->use() : 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 ? 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() : ""); + } else if (property == TextContentProperty::BURN) { + checked_set (_burn, scs ? scs->subtitle->burn() : false); + } else if (property == TextContentProperty::X_OFFSET) { + checked_set (_x_offset, scs ? lrint (scs->subtitle->x_offset() * 100) : 0); + } else if (property == TextContentProperty::Y_OFFSET) { + checked_set (_y_offset, scs ? lrint (scs->subtitle->y_offset() * 100) : 0); + } else if (property == TextContentProperty::X_SCALE) { + checked_set (_x_scale, scs ? lrint (scs->subtitle->x_scale() * 100) : 100); + } else if (property == TextContentProperty::Y_SCALE) { + checked_set (_y_scale, scs ? lrint (scs->subtitle->y_scale() * 100) : 100); + } else if (property == TextContentProperty::LINE_SPACING) { + checked_set (_line_spacing, scs ? lrint (scs->subtitle->line_spacing() * 100) : 100); + } else if (property == TextContentProperty::LANGUAGE) { + checked_set (_language, scs ? scs->subtitle->language() : ""); } else if (property == DCPContentProperty::REFERENCE_SUBTITLE) { if (scs) { shared_ptr dcp = dynamic_pointer_cast (scs); @@ -207,6 +234,8 @@ SubtitlePanel::film_content_changed (int property) checked_set (_reference, false); } + setup_sensitivity (); + } else if (property == DCPContentProperty::HAS_SUBTITLES) { setup_sensitivity (); } } @@ -214,16 +243,16 @@ SubtitlePanel::film_content_changed (int property) void SubtitlePanel::use_toggled () { - BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { - i->set_use_subtitles (_use->GetValue()); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_use (_use->GetValue()); } } void SubtitlePanel::burn_toggled () { - BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { - i->set_burn_subtitles (_burn->GetValue()); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_burn (_burn->GetValue()); } } @@ -232,59 +261,51 @@ SubtitlePanel::setup_sensitivity () { int any_subs = 0; int ffmpeg_subs = 0; - int text_subs = 0; - int dcp_subs = 0; - int image_subs = 0; - SubtitleContentList sel = _parent->selected_subtitle (); - BOOST_FOREACH (shared_ptr i, sel) { + ContentList sel = _parent->selected_subtitle (); + BOOST_FOREACH (shared_ptr i, sel) { + /* These are the content types that could include subtitles */ shared_ptr fc = boost::dynamic_pointer_cast (i); - shared_ptr sc = boost::dynamic_pointer_cast (i); - shared_ptr dsc = boost::dynamic_pointer_cast (i); + shared_ptr sc = boost::dynamic_pointer_cast (i); + shared_ptr dc = boost::dynamic_pointer_cast (i); + shared_ptr dsc = boost::dynamic_pointer_cast (i); if (fc) { - if (fc->has_subtitles ()) { + if (fc->subtitle) { ++ffmpeg_subs; ++any_subs; } - } else if (sc) { - ++text_subs; - ++any_subs; - } else if (dsc) { - ++dcp_subs; + } else if (sc || dc || dsc) { + /* XXX: in the future there could be bitmap subs from DCPs */ ++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); } } + /* Decide whether we can reference these subs */ + shared_ptr dcp; if (sel.size() == 1) { dcp = dynamic_pointer_cast (sel.front ()); } - list why_not; + string why_not; bool const can_reference = dcp && dcp->can_reference_subtitle (why_not); - setup_refer_button (_reference, dcp, can_reference, why_not); + setup_refer_button (_reference, _reference_note, dcp, can_reference, why_not); bool const reference = _reference->GetValue (); + /* Set up sensitivity */ _use->Enable (!reference && any_subs > 0); bool const use = _use->GetValue (); - _burn->Enable (!reference && any_subs > 0 && use && image_subs == 0); + _burn->Enable (!reference && any_subs > 0 && use); _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); + _line_spacing->Enable (!reference && 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)); + _subtitle_view_button->Enable (!reference); + _fonts_dialog_button->Enable (!reference); + _appearance_dialog_button->Enable (!reference && any_subs > 0 && use); } void @@ -312,41 +333,49 @@ SubtitlePanel::stream_changed () void SubtitlePanel::x_offset_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { - i->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 () { - BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { - i->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::x_scale_changed () { - SubtitleContentList c = _parent->selected_subtitle (); + ContentList c = _parent->selected_subtitle (); if (c.size() == 1) { - c.front()->set_subtitle_x_scale (_x_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->set_subtitle_y_scale (_y_scale->GetValue() / 100.0); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_y_scale (_y_scale->GetValue() / 100.0); + } +} + +void +SubtitlePanel::line_spacing_changed () +{ + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_line_spacing (_line_spacing->GetValue() / 100.0); } } void SubtitlePanel::language_changed () { - BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { - i->set_subtitle_language (wx_to_std (_language->GetValue())); + BOOST_FOREACH (shared_ptr i, _parent->selected_subtitle ()) { + i->subtitle->set_language (wx_to_std (_language->GetValue())); } } @@ -354,14 +383,15 @@ void 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 (TextContentProperty::USE); + film_content_changed (TextContentProperty::BURN); + film_content_changed (TextContentProperty::X_OFFSET); + film_content_changed (TextContentProperty::Y_OFFSET); + film_content_changed (TextContentProperty::X_SCALE); + film_content_changed (TextContentProperty::Y_SCALE); + film_content_changed (TextContentProperty::LINE_SPACING); + film_content_changed (TextContentProperty::LANGUAGE); + film_content_changed (TextContentProperty::FONTS); film_content_changed (DCPContentProperty::REFERENCE_SUBTITLE); } @@ -373,23 +403,13 @@ SubtitlePanel::subtitle_view_clicked () _subtitle_view = 0; } - SubtitleContentList c = _parent->selected_subtitle (); + ContentList 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 TextSubtitleDecoder (sr)); - } - - shared_ptr dc = dynamic_pointer_cast (c.front ()); - if (dc) { - decoder.reset (new DCPSubtitleDecoder (dc)); - } + shared_ptr decoder = decoder_factory (c.front(), _parent->film()->log(), false); if (decoder) { - _subtitle_view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ()); + _subtitle_view = new SubtitleView (this, _parent->film(), c.front(), decoder, _parent->film_viewer()); _subtitle_view->Show (); } } @@ -402,7 +422,7 @@ SubtitlePanel::fonts_dialog_clicked () _fonts_dialog = 0; } - SubtitleContentList c = _parent->selected_subtitle (); + ContentList c = _parent->selected_subtitle (); DCPOMATIC_ASSERT (c.size() == 1); _fonts_dialog = new FontsDialog (this, c.front ()); @@ -428,23 +448,12 @@ SubtitlePanel::reference_clicked () void SubtitlePanel::appearance_dialog_clicked () { - SubtitleContentList c = _parent->selected_subtitle (); + 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 (); + SubtitleAppearanceDialog* d = new SubtitleAppearanceDialog (this, c.front()); + if (d->ShowModal () == wxID_OK) { + d->apply (); } + d->Destroy (); }