X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_content.cc;h=a9ed8608350fdbb9f9a48b8f2fbc2edfd598da56;hb=444809fb888ed99803f2d19c94d3faef067cf348;hp=761ffc6b729dffce64e23397bc48f5c5b7f5dcfc;hpb=24dcab1d4d8d7a28a939c7c4d786197684f155f6;p=dcpomatic.git diff --git a/src/lib/text_content.cc b/src/lib/text_content.cc index 761ffc6b7..a9ed86083 100644 --- a/src/lib/text_content.cc +++ b/src/lib/text_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -26,7 +26,6 @@ #include #include #include -#include #include #include "i18n.h" @@ -35,10 +34,12 @@ using std::string; using std::vector; using std::cout; using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::make_shared; +using std::dynamic_pointer_cast; using boost::optional; using dcp::raw_convert; +using namespace dcpomatic; int const TextContentProperty::X_OFFSET = 500; int const TextContentProperty::Y_OFFSET = 501; @@ -46,16 +47,16 @@ int const TextContentProperty::X_SCALE = 502; int const TextContentProperty::Y_SCALE = 503; int const TextContentProperty::USE = 504; int const TextContentProperty::BURN = 505; -int const TextContentProperty::LANGUAGE = 506; -int const TextContentProperty::FONTS = 507; -int const TextContentProperty::COLOUR = 508; -int const TextContentProperty::EFFECT = 509; -int const TextContentProperty::EFFECT_COLOUR = 510; -int const TextContentProperty::LINE_SPACING = 511; -int const TextContentProperty::FADE_IN = 512; -int const TextContentProperty::FADE_OUT = 513; -int const TextContentProperty::OUTLINE_WIDTH = 514; -int const TextContentProperty::TYPE = 515; +int const TextContentProperty::FONTS = 506; +int const TextContentProperty::COLOUR = 507; +int const TextContentProperty::EFFECT = 508; +int const TextContentProperty::EFFECT_COLOUR = 509; +int const TextContentProperty::LINE_SPACING = 510; +int const TextContentProperty::FADE_IN = 511; +int const TextContentProperty::FADE_OUT = 512; +int const TextContentProperty::OUTLINE_WIDTH = 513; +int const TextContentProperty::TYPE = 514; +int const TextContentProperty::DCP_TRACK = 515; TextContent::TextContent (Content* parent, TextType type, TextType original_type) : ContentPart (parent) @@ -66,17 +67,17 @@ TextContent::TextContent (Content* parent, TextType type, TextType original_type , _x_scale (1) , _y_scale (1) , _line_spacing (1) - , _outline_width (2) + , _outline_width (4) , _type (type) , _original_type (original_type) { } -/** @return TextContents from node or nodes under node (according to version). +/** @return TextContents from node or nodes under node (according to version). * The list could be empty if no TextContents are found. */ -list > +list> TextContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) { if (version < 34) { @@ -84,7 +85,7 @@ TextContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) subtitle streams, so check for that. */ if (node->string_child("Type") == "FFmpeg" && node->node_children("SubtitleStream").empty()) { - return list >(); + return {}; } /* Otherwise we can drop through to the newer logic */ @@ -92,21 +93,22 @@ TextContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) if (version < 37) { if (!node->optional_number_child("SubtitleXOffset") && !node->optional_number_child("SubtitleOffset")) { - return list >(); + return {}; } - list > c; - c.push_back (shared_ptr (new TextContent (parent, node, version))); + list> c; + c.push_back (make_shared(parent, node, version)); return c; } - if (!node->optional_node_child("Caption")) { - return list >(); + if (!node->optional_node_child("Text")) { + return {}; } - list > c; - BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Caption")) { - c.push_back (shared_ptr (new TextContent (parent, i, version))); + list> c; + for (auto i: node->node_children("Text")) { + c.push_back (make_shared(parent, i, version)); } + return c; } @@ -119,8 +121,9 @@ TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version) , _x_scale (1) , _y_scale (1) , _line_spacing (node->optional_number_child("LineSpacing").get_value_or (1)) - , _outline_width (node->optional_number_child("OutlineWidth").get_value_or (2)) + , _outline_width (node->optional_number_child("OutlineWidth").get_value_or (4)) , _type (TEXT_OPEN_SUBTITLE) + , _original_type (TEXT_OPEN_SUBTITLE) { if (version >= 37) { _use = node->bool_child ("Use"); @@ -148,7 +151,7 @@ TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version) _effect = dcp::NONE; } - optional effect = node->optional_string_child("Effect"); + auto effect = node->optional_string_child("Effect"); if (effect) { if (*effect == "none") { _effect = dcp::NONE; @@ -169,17 +172,17 @@ TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version) _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"); + auto r = node->optional_number_child("Red"); + auto g = node->optional_number_child("Green"); + auto b = node->optional_number_child("Blue"); if (r && g && b) { _colour = dcp::Colour (*r, *g, *b); } if (version >= 36) { - optional er = node->optional_number_child("EffectRed"); - optional eg = node->optional_number_child("EffectGreen"); - optional eb = node->optional_number_child("EffectBlue"); + auto er = node->optional_number_child("EffectRed"); + auto eg = node->optional_number_child("EffectGreen"); + auto eb = node->optional_number_child("EffectBlue"); if (er && eg && eb) { _effect_colour = dcp::Colour (*er, *eg, *eb); } @@ -211,34 +214,34 @@ TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version) _fade_out = ContentTime (*fo); } - if (version >= 37) { - _language = node->optional_string_child ("Language").get_value_or (""); - } else { - _language = node->optional_string_child ("SubtitleLanguage").get_value_or (""); - } - - list fonts = node->node_children ("Font"); - for (list::const_iterator i = fonts.begin(); i != fonts.end(); ++i) { - _fonts.push_back (shared_ptr (new Font (*i))); + for (auto i: node->node_children ("Font")) { + _fonts.push_back (make_shared(i)); } connect_to_fonts (); - _type = string_to_text_type (node->optional_string_child("Type").get_value_or("open")); - if (node->optional_string_child("OriginalType")) { - _original_type = string_to_text_type (node->optional_string_child("OriginalType").get()); + if (version >= 37) { + _type = string_to_text_type (node->optional_string_child("Type").get_value_or("open")); + if (node->optional_string_child("OriginalType")) { + _original_type = string_to_text_type (node->optional_string_child("OriginalType").get()); + } + } + + auto dt = node->optional_node_child("DCPTrack"); + if (dt) { + _dcp_track = DCPTextTrack (dt); } } -TextContent::TextContent (Content* parent, vector > c) +TextContent::TextContent (Content* parent, vector> c) : ContentPart (parent) { /* This constructor is for join which is only supported for content types that have a single text, so we can use only_text() here. */ - shared_ptr ref = c[0]->only_text(); + auto ref = c[0]->only_text(); DCPOMATIC_ASSERT (ref); - list > ref_fonts = ref->fonts (); + auto ref_fonts = ref->fonts (); for (size_t i = 1; i < c.size(); ++i) { @@ -278,13 +281,17 @@ TextContent::TextContent (Content* parent, vector > c) throw JoinError (_("Content to be joined must have the same outline width.")); } - list > fonts = c[i]->only_text()->fonts (); + auto fonts = c[i]->only_text()->fonts (); if (fonts.size() != ref_fonts.size()) { throw JoinError (_("Content to be joined must use the same fonts.")); } - list >::const_iterator j = ref_fonts.begin (); - list >::const_iterator k = fonts.begin (); + if (c[i]->only_text()->dcp_track() != ref->dcp_track()) { + throw JoinError (_("Content to be joined must use the same DCP track.")); + } + + auto j = ref_fonts.begin (); + auto k = fonts.begin (); while (j != ref_fonts.end ()) { if (**j != **k) { @@ -301,7 +308,6 @@ TextContent::TextContent (Content* parent, vector > c) _y_offset = ref->y_offset (); _x_scale = ref->x_scale (); _y_scale = ref->y_scale (); - _language = ref->language (); _fonts = ref_fonts; _line_spacing = ref->line_spacing (); _fade_in = ref->fade_in (); @@ -309,6 +315,7 @@ TextContent::TextContent (Content* parent, vector > c) _outline_width = ref->outline_width (); _type = ref->type (); _original_type = ref->original_type (); + _dcp_track = ref->dcp_track (); connect_to_fonts (); } @@ -319,7 +326,7 @@ TextContent::as_xml (xmlpp::Node* root) const { boost::mutex::scoped_lock lm (_mutex); - xmlpp::Element* text = root->add_child ("Text"); + auto text = root->add_child ("Text"); text->add_child("Use")->add_child_text (_use ? "1" : "0"); text->add_child("Burn")->add_child_text (_burn ? "1" : "0"); @@ -327,7 +334,6 @@ TextContent::as_xml (xmlpp::Node* root) const text->add_child("YOffset")->add_child_text (raw_convert (_y_offset)); text->add_child("XScale")->add_child_text (raw_convert (_x_scale)); text->add_child("YScale")->add_child_text (raw_convert (_y_scale)); - text->add_child("Language")->add_child_text (_language); if (_colour) { text->add_child("Red")->add_child_text (raw_convert (_colour->r)); text->add_child("Green")->add_child_text (raw_convert (_colour->g)); @@ -360,18 +366,21 @@ TextContent::as_xml (xmlpp::Node* root) const } text->add_child("OutlineWidth")->add_child_text (raw_convert (_outline_width)); - for (list >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) { - (*i)->as_xml (text->add_child("Font")); + for (auto i: _fonts) { + i->as_xml (text->add_child("Font")); } text->add_child("Type")->add_child_text (text_type_to_string(_type)); text->add_child("OriginalType")->add_child_text (text_type_to_string(_original_type)); + if (_dcp_track) { + _dcp_track->as_xml(text->add_child("DCPTrack")); + } } string TextContent::identifier () const { - string s = raw_convert (x_scale()) + auto s = raw_convert (x_scale()) + "_" + raw_convert (y_scale()) + "_" + raw_convert (x_offset()) + "_" + raw_convert (y_offset()) @@ -381,20 +390,17 @@ TextContent::identifier () const + "_" + raw_convert (outline_width()) + "_" + raw_convert (colour().get_value_or(dcp::Colour(255, 255, 255)).to_argb_string()) + "_" + raw_convert (dcp::effect_to_string(effect().get_value_or(dcp::NONE))) - + "_" + raw_convert (effect_colour().get_value_or(dcp::Colour(0, 0, 0)).to_argb_string()); + + "_" + raw_convert (effect_colour().get_value_or(dcp::Colour(0, 0, 0)).to_argb_string()) + + "_" + raw_convert (_parent->video_frame_rate().get_value_or(0)); /* 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").string(); - } + for (auto f: _fonts) { + s += "_" + f->file().get_value_or("Default").string(); } - /* The language is for metadata only, and doesn't affect - how this content looks. - */ + /* The DCP track is for metadata only, and doesn't affect how this content looks */ return s; } @@ -409,13 +415,13 @@ TextContent::add_font (shared_ptr font) void TextContent::connect_to_fonts () { - BOOST_FOREACH (boost::signals2::connection& i, _font_connections) { + for (auto const& i: _font_connections) { i.disconnect (); } _font_connections.clear (); - BOOST_FOREACH (shared_ptr i, _fonts) { + for (auto i: _fonts) { _font_connections.push_back (i->Changed.connect (boost::bind (&TextContent::font_changed, this))); } } @@ -423,7 +429,8 @@ TextContent::connect_to_fonts () void TextContent::font_changed () { - _parent->signal_changed (TextContentProperty::FONTS); + /* XXX: too late */ + ChangeSignaller cc (_parent, TextContentProperty::FONTS); } void @@ -498,12 +505,6 @@ TextContent::set_y_scale (double s) maybe_set (_y_scale, s, TextContentProperty::Y_SCALE); } -void -TextContent::set_language (string language) -{ - maybe_set (_language, language, TextContentProperty::LANGUAGE); -} - void TextContent::set_line_spacing (double s) { @@ -546,6 +547,18 @@ TextContent::set_outline_width (int w) maybe_set (_outline_width, w, TextContentProperty::OUTLINE_WIDTH); } +void +TextContent::set_dcp_track (DCPTextTrack t) +{ + maybe_set (_dcp_track, t, TextContentProperty::DCP_TRACK); +} + +void +TextContent::unset_dcp_track () +{ + maybe_set (_dcp_track, optional(), TextContentProperty::DCP_TRACK); +} + void TextContent::take_settings_from (shared_ptr c) { @@ -577,4 +590,9 @@ TextContent::take_settings_from (shared_ptr c) set_fade_out (*c->_fade_out); } set_outline_width (c->_outline_width); + if (c->_dcp_track) { + set_dcp_track (c->_dcp_track.get()); + } else { + unset_dcp_track (); + } }