X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_subtitle_content.cc;h=24a328d088e3c05001f9be31f2f1b614233010da;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=0de219574332ea8b542a9f00478d15ecfef369bb;hpb=055531be9496a212c86686936198cd1cf10b619d;p=dcpomatic.git diff --git a/src/lib/text_subtitle_content.cc b/src/lib/text_subtitle_content.cc index 0de219574..24a328d08 100644 --- a/src/lib/text_subtitle_content.cc +++ b/src/lib/text_subtitle_content.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2014-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,6 +24,7 @@ #include "film.h" #include "font.h" #include "raw_convert.h" +#include "subtitle_content.h" #include #include @@ -32,40 +34,17 @@ using std::string; using std::cout; using boost::shared_ptr; -std::string const TextSubtitleContent::font_id = "font"; - -int const TextSubtitleContentProperty::TEXT_SUBTITLE_COLOUR = 300; -int const TextSubtitleContentProperty::TEXT_SUBTITLE_OUTLINE = 301; -int const TextSubtitleContentProperty::TEXT_SUBTITLE_OUTLINE_COLOUR = 302; - TextSubtitleContent::TextSubtitleContent (shared_ptr film, boost::filesystem::path path) : Content (film, path) - , SubtitleContent (film, path) - , _colour (255, 255, 255) - , _outline (false) - , _outline_colour (0, 0, 0) { - + subtitle.reset (new SubtitleContent (this)); } TextSubtitleContent::TextSubtitleContent (shared_ptr film, cxml::ConstNodePtr node, int version) : Content (film, node) - , SubtitleContent (film, node, version) , _length (node->number_child ("Length")) - , _frame_rate (node->optional_number_child("SubtitleVideoFrameRate")) - , _colour ( - node->optional_number_child("Red").get_value_or(255), - node->optional_number_child("Green").get_value_or(255), - node->optional_number_child("Blue").get_value_or(255) - ) - , _outline (node->optional_bool_child("Outline").get_value_or(false)) - , _outline_colour ( - node->optional_number_child("OutlineRed").get_value_or(255), - node->optional_number_child("OutlineGreen").get_value_or(255), - node->optional_number_child("OutlineBlue").get_value_or(255) - ) { - + subtitle = SubtitleContent::from_xml (this, node, version); } void @@ -75,11 +54,11 @@ TextSubtitleContent::examine (boost::shared_ptr job) TextSubtitle s (shared_from_this ()); /* Default to turning these subtitles on */ - set_use_subtitles (true); + subtitle->set_use (true); boost::mutex::scoped_lock lm (_mutex); _length = s.length (); - add_font (shared_ptr (new Font (font_id))); + subtitle->add_font (shared_ptr (new Font (TEXT_FONT_ID))); } string @@ -99,95 +78,17 @@ TextSubtitleContent::as_xml (xmlpp::Node* node) const { node->add_child("Type")->add_child_text ("TextSubtitle"); Content::as_xml (node); - SubtitleContent::as_xml (node); - node->add_child("Length")->add_child_text (raw_convert (_length.get ())); - if (_frame_rate) { - node->add_child("SubtitleVideoFrameRate")->add_child_text (raw_convert (_frame_rate.get())); + + if (subtitle) { + subtitle->as_xml (node); } - node->add_child("Red")->add_child_text (raw_convert (_colour.r)); - node->add_child("Green")->add_child_text (raw_convert (_colour.g)); - node->add_child("Blue")->add_child_text (raw_convert (_colour.b)); - node->add_child("Outline")->add_child_text (raw_convert (_outline)); - node->add_child("OutlineRed")->add_child_text (raw_convert (_outline_colour.r)); - node->add_child("OutlineGreen")->add_child_text (raw_convert (_outline_colour.g)); - node->add_child("OutlineBlue")->add_child_text (raw_convert (_outline_colour.b)); + + node->add_child("Length")->add_child_text (raw_convert (_length.get ())); } DCPTime TextSubtitleContent::full_length () const { - FrameRateChange const frc (subtitle_video_frame_rate(), film()->video_frame_rate ()); + FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate ()); return DCPTime (_length, frc); } - -void -TextSubtitleContent::set_subtitle_video_frame_rate (double r) -{ - { - boost::mutex::scoped_lock lm (_mutex); - _frame_rate = r; - } - - signal_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE); -} - -double -TextSubtitleContent::subtitle_video_frame_rate () const -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_frame_rate) { - return _frame_rate.get (); - } - } - - /* No frame rate specified, so assume this content has been - prepared for any concurrent video content. - */ - return film()->active_frame_rate_change(position()).source; -} - -void -TextSubtitleContent::set_colour (dcp::Colour colour) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_colour == colour) { - return; - } - - _colour = colour; - } - - signal_changed (TextSubtitleContentProperty::TEXT_SUBTITLE_COLOUR); -} - -void -TextSubtitleContent::set_outline (bool o) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_outline == o) { - return; - } - - _outline = o; - } - - signal_changed (TextSubtitleContentProperty::TEXT_SUBTITLE_OUTLINE); -} - -void -TextSubtitleContent::set_outline_colour (dcp::Colour colour) -{ - { - boost::mutex::scoped_lock lm (_mutex); - if (_outline_colour == colour) { - return; - } - - _outline_colour = colour; - } - - signal_changed (TextSubtitleContentProperty::TEXT_SUBTITLE_OUTLINE_COLOUR); -}