int const CaptionContentProperty::OUTLINE_WIDTH = 514;
int const CaptionContentProperty::TYPE = 515;
-CaptionContent::CaptionContent (Content* parent)
+CaptionContent::CaptionContent (Content* parent, CaptionType original_type)
: ContentPart (parent)
, _use (false)
, _burn (false)
, _y_scale (1)
, _line_spacing (1)
, _outline_width (2)
- , _type (CAPTION_OPEN)
- , _original_type (CAPTION_OPEN)
+ , _type (original_type)
+ , _original_type (original_type)
{
}
return c;
}
- if (!node->node_child("Caption")) {
+ if (!node->optional_node_child("Caption")) {
return list<shared_ptr<CaptionContent> >();
}
, _line_spacing (node->optional_number_child<double>("LineSpacing").get_value_or (1))
, _outline_width (node->optional_number_child<int>("OutlineWidth").get_value_or (2))
, _type (CAPTION_OPEN)
+ , _original_type (CAPTION_OPEN)
{
if (version >= 37) {
_use = node->bool_child ("Use");
connect_to_fonts ();
_type = string_to_caption_type (node->optional_string_child("Type").get_value_or("open"));
- _original_type = string_to_caption_type (node->optional_string_child("Type").get_value_or("open"));
+ _original_type = string_to_caption_type (node->optional_string_child("OriginalType").get_value_or("open"));
}
CaptionContent::CaptionContent (Content* parent, vector<shared_ptr<Content> > c)
_fade_in = ref->fade_in ();
_fade_out = ref->fade_out ();
_outline_width = ref->outline_width ();
+ _type = ref->type ();
+ _original_type = ref->original_type ();
connect_to_fonts ();
}