int const TextContentProperty::Y_SCALE = 503;
int const TextContentProperty::USE = 504;
int const TextContentProperty::BURN = 505;
-int const TextContentProperty::NAME = 506;
-int const TextContentProperty::LANGUAGE = 507;
-int const TextContentProperty::FONTS = 508;
-int const TextContentProperty::COLOUR = 509;
-int const TextContentProperty::EFFECT = 510;
-int const TextContentProperty::EFFECT_COLOUR = 511;
-int const TextContentProperty::LINE_SPACING = 512;
-int const TextContentProperty::FADE_IN = 513;
-int const TextContentProperty::FADE_OUT = 514;
-int const TextContentProperty::OUTLINE_WIDTH = 515;
-int const TextContentProperty::TYPE = 516;
+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::DCP_TRACK = 516;
TextContent::TextContent (Content* parent, TextType type, TextType original_type)
: ContentPart (parent)
, _x_scale (1)
, _y_scale (1)
, _line_spacing (1)
- , _outline_width (2)
+ , _outline_width (4)
, _type (type)
, _original_type (original_type)
{
BOOST_FOREACH (cxml::ConstNodePtr i, node->node_children("Text")) {
c.push_back (shared_ptr<TextContent> (new TextContent (parent, i, version)));
}
+
return c;
}
, _x_scale (1)
, _y_scale (1)
, _line_spacing (node->optional_number_child<double>("LineSpacing").get_value_or (1))
- , _outline_width (node->optional_number_child<int>("OutlineWidth").get_value_or (2))
+ , _outline_width (node->optional_number_child<int>("OutlineWidth").get_value_or (4))
, _type (TEXT_OPEN_SUBTITLE)
, _original_type (TEXT_OPEN_SUBTITLE)
{
_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
}
- _name = node->optional_string_child("Name").get_value_or("");
-
list<cxml::NodePtr> fonts = node->node_children ("Font");
for (list<cxml::NodePtr>::const_iterator i = fonts.begin(); i != fonts.end(); ++i) {
_fonts.push_back (shared_ptr<Font> (new Font (*i)));
_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<shared_ptr<Content> > 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<shared_ptr<Font> >::const_iterator j = ref_fonts.begin ();
list<shared_ptr<Font> >::const_iterator k = fonts.begin ();
_y_offset = ref->y_offset ();
_x_scale = ref->x_scale ();
_y_scale = ref->y_scale ();
- _name = ref->name ();
_language = ref->language ();
_fonts = ref_fonts;
_line_spacing = ref->line_spacing ();
_outline_width = ref->outline_width ();
_type = ref->type ();
_original_type = ref->original_type ();
+ _dcp_track = ref->dcp_track ();
connect_to_fonts ();
}
text->add_child("YOffset")->add_child_text (raw_convert<string> (_y_offset));
text->add_child("XScale")->add_child_text (raw_convert<string> (_x_scale));
text->add_child("YScale")->add_child_text (raw_convert<string> (_y_scale));
- text->add_child("Name")->add_child_text (_name);
text->add_child("Language")->add_child_text (_language);
if (_colour) {
text->add_child("Red")->add_child_text (raw_convert<string> (_colour->r));
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
}
}
- /* The name and language are for metadata only, and don't affect
+ /* The DCP track and language are for metadata only, and don't affect
how this content looks.
*/
maybe_set (_y_scale, s, TextContentProperty::Y_SCALE);
}
-void
-TextContent::set_name (string name)
-{
- maybe_set (_name, name, TextContentProperty::NAME);
-}
-
void
TextContent::set_language (string language)
{
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<DCPTextTrack>(), TextContentProperty::DCP_TRACK);
+}
+
void
TextContent::take_settings_from (shared_ptr<const TextContent> 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 ();
+ }
}