int const SubtitleContentProperty::LANGUAGE = 506;
int const SubtitleContentProperty::FONTS = 507;
int const SubtitleContentProperty::COLOUR = 508;
-int const SubtitleContentProperty::OUTLINE = 509;
-int const SubtitleContentProperty::SHADOW = 510;
-int const SubtitleContentProperty::EFFECT_COLOUR = 511;
-int const SubtitleContentProperty::LINE_SPACING = 512;
-int const SubtitleContentProperty::FADE_IN = 513;
-int const SubtitleContentProperty::FADE_OUT = 514;
-int const SubtitleContentProperty::OUTLINE_WIDTH = 515;
+int const SubtitleContentProperty::EFFECT = 509;
+int const SubtitleContentProperty::EFFECT_COLOUR = 510;
+int const SubtitleContentProperty::LINE_SPACING = 511;
+int const SubtitleContentProperty::FADE_IN = 512;
+int const SubtitleContentProperty::FADE_OUT = 513;
+int const SubtitleContentProperty::OUTLINE_WIDTH = 514;
SubtitleContent::SubtitleContent (Content* parent)
: ContentPart (parent)
, _y_offset (0)
, _x_scale (1)
, _y_scale (1)
- , _outline (false)
- , _shadow (false)
, _line_spacing (1)
, _outline_width (2)
{
, _y_offset (0)
, _x_scale (1)
, _y_scale (1)
- , _outline (node->optional_bool_child("Outline").get_value_or(false))
- , _shadow (node->optional_bool_child("Shadow").get_value_or(false))
, _line_spacing (node->optional_number_child<double>("LineSpacing").get_value_or (1))
- , _fade_in (node->optional_number_child<Frame>("SubtitleFadeIn").get_value_or (0))
- , _fade_out (node->optional_number_child<Frame>("SubtitleFadeOut").get_value_or (0))
, _outline_width (node->optional_number_child<int>("OutlineWidth").get_value_or (2))
{
if (version >= 32) {
_y_offset = node->number_child<double> ("SubtitleOffset");
}
+ if (node->optional_bool_child("Outline").get_value_or(false)) {
+ _effect = dcp::BORDER;
+ } else if (node->optional_bool_child("Shadow").get_value_or(false)) {
+ _effect = dcp::SHADOW;
+ } else {
+ _effect = dcp::NONE;
+ }
+
+ optional<string> effect = node->optional_string_child("Effect");
+ if (effect) {
+ if (*effect == "none") {
+ _effect = dcp::NONE;
+ } else if (*effect == "outline") {
+ _effect = dcp::BORDER;
+ } else if (*effect == "shadow") {
+ _effect = dcp::SHADOW;
+ }
+ }
+
if (version >= 10) {
_x_scale = node->number_child<double> ("SubtitleXScale");
_y_scale = node->number_child<double> ("SubtitleYScale");
);
}
+ optional<Frame> fi = node->optional_number_child<Frame>("SubtitleFadeIn");
+ if (fi) {
+ _fade_in = ContentTime (*fi);
+ }
+ optional<Frame> fo = node->optional_number_child<Frame>("SubtitleFadeOut");
+ if (fo) {
+ _fade_out = ContentTime (*fo);
+ }
+
_language = node->optional_string_child ("SubtitleLanguage").get_value_or ("");
list<cxml::NodePtr> fonts = node->node_children ("Font");
root->add_child("Green")->add_child_text (raw_convert<string> (_colour->g));
root->add_child("Blue")->add_child_text (raw_convert<string> (_colour->b));
}
- root->add_child("Outline")->add_child_text (_outline ? "1" : "0");
- root->add_child("Shadow")->add_child_text (_shadow ? "1" : "0");
+ if (_effect) {
+ switch (*_effect) {
+ case dcp::NONE:
+ root->add_child("Effect")->add_child_text("none");
+ break;
+ case dcp::BORDER:
+ root->add_child("Effect")->add_child_text("outline");
+ break;
+ case dcp::SHADOW:
+ root->add_child("Effect")->add_child_text("shadow");
+ break;
+ }
+ }
if (_effect_colour) {
root->add_child("EffectRed")->add_child_text (raw_convert<string> (_effect_colour->r));
root->add_child("EffectGreen")->add_child_text (raw_convert<string> (_effect_colour->g));
root->add_child("EffectBlue")->add_child_text (raw_convert<string> (_effect_colour->b));
}
root->add_child("LineSpacing")->add_child_text (raw_convert<string> (_line_spacing));
- root->add_child("SubtitleFadeIn")->add_child_text (raw_convert<string> (_fade_in.get()));
- root->add_child("SubtitleFadeOut")->add_child_text (raw_convert<string> (_fade_out.get()));
+ if (_fade_in) {
+ root->add_child("SubtitleFadeIn")->add_child_text (raw_convert<string> (_fade_in->get()));
+ }
+ if (_fade_out) {
+ root->add_child("SubtitleFadeOut")->add_child_text (raw_convert<string> (_fade_out->get()));
+ }
root->add_child("OutlineWidth")->add_child_text (raw_convert<string> (_outline_width));
for (list<shared_ptr<Font> >::const_iterator i = _fonts.begin(); i != _fonts.end(); ++i) {
+ "_" + raw_convert<string> (x_offset())
+ "_" + raw_convert<string> (y_offset())
+ "_" + raw_convert<string> (line_spacing())
- + "_" + raw_convert<string> (fade_in().get())
- + "_" + raw_convert<string> (fade_out().get())
+ + "_" + raw_convert<string> (fade_in().get_value_or(ContentTime()).get())
+ + "_" + raw_convert<string> (fade_out().get_value_or(ContentTime()).get())
+ "_" + raw_convert<string> (outline_width());
/* XXX: I suppose really _fonts shouldn't be in here, since not all
}
void
-SubtitleContent::set_outline (bool o)
+SubtitleContent::set_effect (dcp::Effect e)
{
- maybe_set (_outline, o, SubtitleContentProperty::OUTLINE);
+ maybe_set (_effect, e, SubtitleContentProperty::EFFECT);
}
void
-SubtitleContent::set_shadow (bool s)
+SubtitleContent::unset_effect ()
{
- maybe_set (_shadow, s, SubtitleContentProperty::SHADOW);
+ maybe_set (_effect, optional<dcp::Effect>(), SubtitleContentProperty::EFFECT);
}
void
maybe_set (_fade_in, t, SubtitleContentProperty::FADE_IN);
}
+void
+SubtitleContent::unset_fade_in ()
+{
+ maybe_set (_fade_in, optional<ContentTime>(), SubtitleContentProperty::FADE_IN);
+}
+
void
SubtitleContent::set_fade_out (ContentTime t)
{
maybe_set (_fade_out, t, SubtitleContentProperty::FADE_OUT);
}
+void
+SubtitleContent::unset_fade_out ()
+{
+ maybe_set (_fade_out, optional<ContentTime>(), SubtitleContentProperty::FADE_OUT);
+}
+
void
SubtitleContent::set_outline_width (int w)
{
} else {
unset_colour ();
}
- set_outline (c->_outline);
- set_shadow (c->_shadow);
+ if (c->_effect) {
+ set_effect (*c->_effect);
+ }
if (c->_effect_colour) {
set_effect_colour (*c->_effect_colour);
} else {
unset_effect_colour ();
}
set_line_spacing (c->_line_spacing);
- set_fade_in (c->_fade_in);
- set_fade_out (c->_fade_out);
+ if (c->_fade_in) {
+ set_fade_in (*c->_fade_in);
+ }
+ if (c->_fade_out) {
+ set_fade_out (*c->_fade_out);
+ }
set_outline_width (c->_outline_width);
}