X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftext_content.cc;h=901d38647c05bdd20504c8ce6e69e893c56fd1ad;hp=011c42f35fff5318ef2ad528608708250970141a;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=a5c629cb9b638b67a0e4c2d26fe9ab2e124bf0eb diff --git a/src/lib/text_content.cc b/src/lib/text_content.cc index 011c42f35..901d38647 100644 --- a/src/lib/text_content.cc +++ b/src/lib/text_content.cc @@ -39,6 +39,7 @@ using boost::shared_ptr; using boost::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; @@ -56,8 +57,9 @@ 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::DCP_TRACK = 516; -TextContent::TextContent (Content* parent, TextType original_type) +TextContent::TextContent (Content* parent, TextType type, TextType original_type) : ContentPart (parent) , _use (false) , _burn (false) @@ -66,14 +68,14 @@ TextContent::TextContent (Content* parent, TextType original_type) , _x_scale (1) , _y_scale (1) , _line_spacing (1) - , _outline_width (2) - , _type (original_type) + , _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 > @@ -99,14 +101,15 @@ TextContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version) return c; } - if (!node->optional_node_child("Caption")) { + if (!node->optional_node_child("Text")) { return list >(); } list > c; - BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Caption")) { + BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Text")) { c.push_back (shared_ptr (new TextContent (parent, i, version))); } + return c; } @@ -119,7 +122,7 @@ 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) { @@ -225,8 +228,17 @@ TextContent::TextContent (Content* parent, cxml::ConstNodePtr node, int version) connect_to_fonts (); - _type = string_to_text_type (node->optional_string_child("Type").get_value_or("open")); - _original_type = string_to_text_type (node->optional_string_child("OriginalType").get_value_or("open")); + 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()); + } + } + + cxml::ConstNodePtr dt = node->optional_node_child("DCPTrack"); + if (dt) { + _dcp_track = DCPTextTrack (dt); + } } TextContent::TextContent (Content* parent, vector > c) @@ -282,6 +294,10 @@ TextContent::TextContent (Content* parent, vector > c) throw JoinError (_("Content to be joined must use the same fonts.")); } + if (c[i]->only_text()->dcp_track() != ref->dcp_track()) { + throw JoinError (_("Content to be joined must use the same DCP track.")); + } + list >::const_iterator j = ref_fonts.begin (); list >::const_iterator k = fonts.begin (); @@ -308,6 +324,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 (); } @@ -365,6 +382,9 @@ TextContent::as_xml (xmlpp::Node* root) const 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 @@ -380,18 +400,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(); - } + s += "_" + f->file().get_value_or("Default").string(); } - /* The language is for metadata only, and doesn't affect + /* The DCP track and language are for metadata only, and don't affect how this content looks. */ @@ -422,7 +441,8 @@ TextContent::connect_to_fonts () void TextContent::font_changed () { - _parent->signal_changed (TextContentProperty::FONTS); + /* XXX: too late */ + ChangeSignaller cc (_parent, TextContentProperty::FONTS); } void @@ -545,6 +565,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) { @@ -576,4 +608,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 (); + } }