X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_content.cc;h=ac49be474e1ae70c4685bfaa5b5d93df966a8bd0;hb=71589ebfea5a7adc49f013d405b3158ea612222a;hp=761ffc6b729dffce64e23397bc48f5c5b7f5dcfc;hpb=24dcab1d4d8d7a28a939c7c4d786197684f155f6;p=dcpomatic.git
diff --git a/src/lib/text_content.cc b/src/lib/text_content.cc
index 761ffc6b7..ac49be474 100644
--- a/src/lib/text_content.cc
+++ b/src/lib/text_content.cc
@@ -56,6 +56,7 @@ 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 type, TextType original_type)
: ContentPart (parent)
@@ -66,14 +67,14 @@ 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 >
@@ -99,14 +100,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,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");
@@ -224,9 +227,16 @@ 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"));
- 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());
+ }
+ }
+
+ cxml::ConstNodePtr dt = node->optional_node_child("DCPTrack");
+ if (dt) {
+ _dcp_track = DCPTextTrack (dt);
}
}
@@ -283,6 +293,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 ();
@@ -309,6 +323,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 ();
}
@@ -366,6 +381,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
@@ -392,7 +410,7 @@ TextContent::identifier () const
}
}
- /* 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.
*/
@@ -423,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
@@ -546,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)
{
@@ -577,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 ();
+ }
}