X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.cc;h=d6bf54aef5cf36a62bfe2d60a487d6ba7a0aa004;hb=73654117144c6de0ec4efe39ddc88485df546cc9;hp=5b3b453b6eaf12d7614c0a3b6beb2f2b87da3bdb;hpb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;p=dcpomatic.git diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 5b3b453b6..d6bf54aef 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -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,7 @@ using std::cout; using std::list; using boost::shared_ptr; using boost::dynamic_pointer_cast; +using dcp::raw_convert; int const SubtitleContentProperty::X_OFFSET = 500; int const SubtitleContentProperty::Y_OFFSET = 501; @@ -49,7 +49,9 @@ int const SubtitleContentProperty::LANGUAGE = 506; int const SubtitleContentProperty::FONTS = 507; int const SubtitleContentProperty::COLOUR = 508; int const SubtitleContentProperty::OUTLINE = 509; -int const SubtitleContentProperty::OUTLINE_COLOUR = 510; +int const SubtitleContentProperty::SHADOW = 510; +int const SubtitleContentProperty::EFFECT_COLOUR = 511; +int const SubtitleContentProperty::LINE_SPACING = 512; SubtitleContent::SubtitleContent (Content* parent) : ContentPart (parent) @@ -61,7 +63,9 @@ SubtitleContent::SubtitleContent (Content* parent) , _y_scale (1) , _colour (255, 255, 255) , _outline (false) - , _outline_colour (0, 0, 0) + , _shadow (false) + , _effect_colour (0, 0, 0) + , _line_spacing (1) { } @@ -101,11 +105,8 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int 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) - ) + , _shadow (node->optional_bool_child("Shadow").get_value_or(false)) + , _line_spacing (node->optional_number_child("LineSpacing").get_value_or (1)) { if (version >= 32) { _use = node->bool_child ("UseSubtitles"); @@ -126,6 +127,20 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int _x_scale = _y_scale = node->number_child ("SubtitleScale"); } + 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) + ); + } else { + _effect_colour = dcp::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) + ); + } + _language = node->optional_string_child ("SubtitleLanguage").get_value_or (""); list fonts = node->node_children ("Font"); @@ -169,6 +184,10 @@ SubtitleContent::SubtitleContent (Content* parent, vector > throw JoinError (_("Content to be joined must have the same subtitle Y scale.")); } + if (c[i]->subtitle->line_spacing() != ref->line_spacing()) { + throw JoinError (_("Content to be joined must have the same subtitle line spacing.")); + } + list > fonts = c[i]->subtitle->fonts (); if (fonts.size() != ref_fonts.size()) { throw JoinError (_("Content to be joined must use the same fonts.")); @@ -194,6 +213,7 @@ SubtitleContent::SubtitleContent (Content* parent, vector > _y_scale = ref->y_scale (); _language = ref->language (); _fonts = ref_fonts; + _line_spacing = ref->line_spacing (); connect_to_fonts (); } @@ -215,9 +235,11 @@ SubtitleContent::as_xml (xmlpp::Node* root) const 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("OutlineRed")->add_child_text (raw_convert (_outline_colour.r)); - root->add_child("OutlineGreen")->add_child_text (raw_convert (_outline_colour.g)); - root->add_child("OutlineBlue")->add_child_text (raw_convert (_outline_colour.b)); + 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)); + root->add_child("LineSpacing")->add_child_text (raw_convert (_line_spacing)); for (list >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) { (*i)->as_xml (root->add_child("Font")); @@ -227,18 +249,18 @@ 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()); + string s = raw_convert (x_scale()) + + "_" + raw_convert (y_scale()) + + "_" + raw_convert (x_offset()) + + "_" + raw_convert (y_offset()) + + "_" + raw_convert (line_spacing()); /* 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(); } } @@ -246,7 +268,7 @@ SubtitleContent::identifier () const how this content looks. */ - return s.str (); + return s; } void @@ -289,9 +311,15 @@ SubtitleContent::set_outline (bool o) } void -SubtitleContent::set_outline_colour (dcp::Colour colour) +SubtitleContent::set_shadow (bool s) +{ + maybe_set (_shadow, s, SubtitleContentProperty::SHADOW); +} + +void +SubtitleContent::set_effect_colour (dcp::Colour colour) { - maybe_set (_outline_colour, colour, SubtitleContentProperty::OUTLINE_COLOUR); + maybe_set (_effect_colour, colour, SubtitleContentProperty::EFFECT_COLOUR); } void @@ -335,3 +363,9 @@ SubtitleContent::set_language (string language) { maybe_set (_language, language, SubtitleContentProperty::LANGUAGE); } + +void +SubtitleContent::set_line_spacing (double s) +{ + maybe_set (_line_spacing, s, SubtitleContentProperty::LINE_SPACING); +}