X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.cc;h=31b4e96ac3cf8083809d0a41af5d9ec6a8b75362;hp=9422bb89428625f874ffe9e8fc5918688b61b10b;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=cef07676fb15c9f1c3c3073d22f06ffe95d9c2ce diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 9422bb894..31b4e96ac 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 . */ @@ -32,15 +33,14 @@ #include "lib/text_subtitle_decoder.h" #include "lib/dcp_subtitle_decoder.h" #include "lib/dcp_content.h" +#include "lib/subtitle_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) @@ -159,14 +159,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 (); } @@ -186,21 +186,21 @@ 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 == SubtitleContentProperty::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 == 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); @@ -216,16 +216,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()); } } @@ -237,13 +237,13 @@ SubtitlePanel::setup_sensitivity () 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) { 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 ()) { + if (fc->subtitle) { ++ffmpeg_subs; ++any_subs; } @@ -257,10 +257,10 @@ SubtitlePanel::setup_sensitivity () ++any_subs; } - if (i->has_image_subtitles ()) { + if (i->subtitle->has_image_subtitles ()) { ++image_subs; /* We must burn image subtitles at the moment */ - i->set_burn_subtitles (true); + i->subtitle->set_burn (true); } } @@ -314,41 +314,41 @@ 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::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())); } } @@ -356,13 +356,13 @@ 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::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); } @@ -375,10 +375,10 @@ 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 decoder; shared_ptr sr = dynamic_pointer_cast (c.front ()); if (sr) { @@ -404,7 +404,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 ()); @@ -430,7 +430,7 @@ 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 ());