X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;h=df05b356afda68b43a53b5f2be04df0fe935039b;hb=67a404fff364c6e1fa02eab270755895ba0e1fe8;hp=2376aac6898a286e42ebc44b9815ba326acc7b70;hpb=ac2fa2172c30c234a19628d7a9ae696e435a56db;p=dcpomatic.git diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 2376aac68..df05b356a 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -21,10 +21,9 @@ #include "subtitle_content.h" #include "util.h" #include "exceptions.h" -#include "safe_stringstream.h" #include "font.h" -#include "raw_convert.h" #include "content.h" +#include #include #include #include @@ -38,6 +37,8 @@ using std::cout; using std::list; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using boost::optional; +using dcp::raw_convert; int const SubtitleContentProperty::X_OFFSET = 500; int const SubtitleContentProperty::Y_OFFSET = 501; @@ -48,10 +49,12 @@ int const SubtitleContentProperty::BURN = 505; int const SubtitleContentProperty::LANGUAGE = 506; int const SubtitleContentProperty::FONTS = 507; int const SubtitleContentProperty::COLOUR = 508; -int const SubtitleContentProperty::OUTLINE = 509; -int const SubtitleContentProperty::SHADOW = 510; -int const SubtitleContentProperty::EFFECT_COLOUR = 511; -int const SubtitleContentProperty::LINE_SPACING = 512; +int const SubtitleContentProperty::EFFECT = 509; +int const SubtitleContentProperty::EFFECT_COLOUR = 510; +int const SubtitleContentProperty::LINE_SPACING = 511; +int const SubtitleContentProperty::FADE_IN = 512; +int const SubtitleContentProperty::FADE_OUT = 513; +int const SubtitleContentProperty::OUTLINE_WIDTH = 514; SubtitleContent::SubtitleContent (Content* parent) : ContentPart (parent) @@ -61,11 +64,9 @@ SubtitleContent::SubtitleContent (Content* parent) , _y_offset (0) , _x_scale (1) , _y_scale (1) - , _colour (255, 255, 255) - , _outline (false) - , _shadow (false) - , _effect_colour (0, 0, 0) + , _effect (dcp::NONE) , _line_spacing (1) + , _outline_width (2) { } @@ -99,14 +100,10 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int , _y_offset (0) , _x_scale (1) , _y_scale (1) - , _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)) - , _shadow (node->optional_bool_child("Shadow").get_value_or(false)) , _line_spacing (node->optional_number_child("LineSpacing").get_value_or (1)) + , _fade_in (node->optional_number_child("SubtitleFadeIn").get_value_or (0)) + , _fade_out (node->optional_number_child("SubtitleFadeOut").get_value_or (0)) + , _outline_width (node->optional_number_child("OutlineWidth").get_value_or (2)) { if (version >= 32) { _use = node->bool_child ("UseSubtitles"); @@ -120,6 +117,25 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int _y_offset = node->number_child ("SubtitleOffset"); } + if (node->optional_bool_child("Outline").get_value_or(false)) { + _effect = dcp::BORDER; + } else if (node->optional_bool_child("Shadow").get_value_or(false)) { + _effect = dcp::SHADOW; + } else { + _effect = dcp::NONE; + } + + optional effect = node->optional_string_child("Effect"); + if (effect) { + if (*effect == "none") { + _effect = dcp::NONE; + } else if (*effect == "outline") { + _effect = dcp::BORDER; + } else if (*effect == "shadow") { + _effect = dcp::SHADOW; + } + } + if (version >= 10) { _x_scale = node->number_child ("SubtitleXScale"); _y_scale = node->number_child ("SubtitleYScale"); @@ -127,12 +143,20 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int _x_scale = _y_scale = node->number_child ("SubtitleScale"); } + optional r = node->optional_number_child("Red"); + optional g = node->optional_number_child("Green"); + optional b = node->optional_number_child("Blue"); + if (r && g && b) { + _colour = dcp::Colour (*r, *g, *b); + } + if (version >= 36) { - _effect_colour = dcp::Colour ( - node->optional_number_child("EffectRed").get_value_or(255), - node->optional_number_child("EffectGreen").get_value_or(255), - node->optional_number_child("EffectBlue").get_value_or(255) - ); + optional er = node->optional_number_child("EffectRed"); + optional eg = node->optional_number_child("EffectGreen"); + optional eb = node->optional_number_child("EffectBlue"); + if (er && eg && eb) { + _effect_colour = dcp::Colour (*er, *eg, *eb); + } } else { _effect_colour = dcp::Colour ( node->optional_number_child("OutlineRed").get_value_or(255), @@ -188,6 +212,14 @@ SubtitleContent::SubtitleContent (Content* parent, vector > throw JoinError (_("Content to be joined must have the same subtitle line spacing.")); } + if ((c[i]->subtitle->fade_in() != ref->fade_in()) || (c[i]->subtitle->fade_out() != ref->fade_out())) { + throw JoinError (_("Content to be joined must have the same subtitle fades.")); + } + + if ((c[i]->subtitle->outline_width() != ref->outline_width())) { + throw JoinError (_("Content to be joined must have the same outline width.")); + } + list > fonts = c[i]->subtitle->fonts (); if (fonts.size() != ref_fonts.size()) { throw JoinError (_("Content to be joined must use the same fonts.")); @@ -214,6 +246,9 @@ SubtitleContent::SubtitleContent (Content* parent, vector > _language = ref->language (); _fonts = ref_fonts; _line_spacing = ref->line_spacing (); + _fade_in = ref->fade_in (); + _fade_out = ref->fade_out (); + _outline_width = ref->outline_width (); connect_to_fonts (); } @@ -224,22 +259,38 @@ SubtitleContent::as_xml (xmlpp::Node* root) const { boost::mutex::scoped_lock lm (_mutex); - root->add_child("UseSubtitles")->add_child_text (raw_convert (_use)); - root->add_child("BurnSubtitles")->add_child_text (raw_convert (_burn)); + root->add_child("UseSubtitles")->add_child_text (_use ? "1" : "0"); + root->add_child("BurnSubtitles")->add_child_text (_burn ? "1" : "0"); root->add_child("SubtitleXOffset")->add_child_text (raw_convert (_x_offset)); root->add_child("SubtitleYOffset")->add_child_text (raw_convert (_y_offset)); root->add_child("SubtitleXScale")->add_child_text (raw_convert (_x_scale)); root->add_child("SubtitleYScale")->add_child_text (raw_convert (_y_scale)); root->add_child("SubtitleLanguage")->add_child_text (_language); - root->add_child("Red")->add_child_text (raw_convert (_colour.r)); - root->add_child("Green")->add_child_text (raw_convert (_colour.g)); - root->add_child("Blue")->add_child_text (raw_convert (_colour.b)); - root->add_child("Outline")->add_child_text (raw_convert (_outline)); - root->add_child("Shadow")->add_child_text (raw_convert (_shadow)); - root->add_child("EffectRed")->add_child_text (raw_convert (_effect_colour.r)); - root->add_child("EffectGreen")->add_child_text (raw_convert (_effect_colour.g)); - root->add_child("EffectBlue")->add_child_text (raw_convert (_effect_colour.b)); + if (_colour) { + root->add_child("Red")->add_child_text (raw_convert (_colour->r)); + root->add_child("Green")->add_child_text (raw_convert (_colour->g)); + root->add_child("Blue")->add_child_text (raw_convert (_colour->b)); + } + switch (_effect) { + case dcp::NONE: + root->add_child("none"); + break; + case dcp::BORDER: + root->add_child("outline"); + break; + case dcp::SHADOW: + root->add_child("shadow"); + break; + } + if (_effect_colour) { + root->add_child("EffectRed")->add_child_text (raw_convert (_effect_colour->r)); + root->add_child("EffectGreen")->add_child_text (raw_convert (_effect_colour->g)); + root->add_child("EffectBlue")->add_child_text (raw_convert (_effect_colour->b)); + } root->add_child("LineSpacing")->add_child_text (raw_convert (_line_spacing)); + root->add_child("SubtitleFadeIn")->add_child_text (raw_convert (_fade_in.get())); + root->add_child("SubtitleFadeOut")->add_child_text (raw_convert (_fade_out.get())); + root->add_child("OutlineWidth")->add_child_text (raw_convert (_outline_width)); for (list >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) { (*i)->as_xml (root->add_child("Font")); @@ -249,19 +300,21 @@ SubtitleContent::as_xml (xmlpp::Node* root) const string SubtitleContent::identifier () const { - SafeStringStream s; - s << raw_convert (x_scale()) - << "_" << raw_convert (y_scale()) - << "_" << raw_convert (x_offset()) - << "_" << raw_convert (y_offset()) - << "_" << raw_convert (line_spacing()); + string s = raw_convert (x_scale()) + + "_" + raw_convert (y_scale()) + + "_" + raw_convert (x_offset()) + + "_" + raw_convert (y_offset()) + + "_" + raw_convert (line_spacing()) + + "_" + raw_convert (fade_in().get()) + + "_" + raw_convert (fade_out().get()) + + "_" + raw_convert (outline_width()); /* XXX: I suppose really _fonts shouldn't be in here, since not all types of subtitle content involve fonts. */ BOOST_FOREACH (shared_ptr f, _fonts) { for (int i = 0; i < FontFiles::VARIANTS; ++i) { - s << "_" << f->file(static_cast(i)).get_value_or ("Default"); + s += "_" + f->file(static_cast(i)).get_value_or("Default").string(); } } @@ -269,7 +322,7 @@ SubtitleContent::identifier () const how this content looks. */ - return s.str (); + return s; } void @@ -306,15 +359,15 @@ SubtitleContent::set_colour (dcp::Colour colour) } void -SubtitleContent::set_outline (bool o) +SubtitleContent::unset_colour () { - maybe_set (_outline, o, SubtitleContentProperty::OUTLINE); + maybe_set (_colour, optional(), SubtitleContentProperty::COLOUR); } void -SubtitleContent::set_shadow (bool s) +SubtitleContent::set_effect (dcp::Effect e) { - maybe_set (_shadow, s, SubtitleContentProperty::SHADOW); + maybe_set (_effect, e, SubtitleContentProperty::EFFECT); } void @@ -323,6 +376,12 @@ SubtitleContent::set_effect_colour (dcp::Colour colour) maybe_set (_effect_colour, colour, SubtitleContentProperty::EFFECT_COLOUR); } +void +SubtitleContent::unset_effect_colour () +{ + maybe_set (_effect_colour, optional(), SubtitleContentProperty::EFFECT_COLOUR); +} + void SubtitleContent::set_use (bool u) { @@ -370,3 +429,48 @@ SubtitleContent::set_line_spacing (double s) { maybe_set (_line_spacing, s, SubtitleContentProperty::LINE_SPACING); } + +void +SubtitleContent::set_fade_in (ContentTime t) +{ + maybe_set (_fade_in, t, SubtitleContentProperty::FADE_IN); +} + +void +SubtitleContent::set_fade_out (ContentTime t) +{ + maybe_set (_fade_out, t, SubtitleContentProperty::FADE_OUT); +} + +void +SubtitleContent::set_outline_width (int w) +{ + maybe_set (_outline_width, w, SubtitleContentProperty::OUTLINE_WIDTH); +} + +void +SubtitleContent::take_settings_from (shared_ptr c) +{ + set_use (c->_use); + set_burn (c->_burn); + set_x_offset (c->_x_offset); + set_y_offset (c->_y_offset); + set_x_scale (c->_x_scale); + set_y_scale (c->_y_scale); + maybe_set (_fonts, c->_fonts, SubtitleContentProperty::FONTS); + if (c->_colour) { + set_colour (*c->_colour); + } else { + unset_colour (); + } + set_effect (c->_effect); + if (c->_effect_colour) { + set_effect_colour (*c->_effect_colour); + } else { + unset_effect_colour (); + } + set_line_spacing (c->_line_spacing); + set_fade_in (c->_fade_in); + set_fade_out (c->_fade_out); + set_outline_width (c->_outline_width); +}