Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

[dcpomatic.git] / src / lib / subtitle_content.cc

diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc
index b169cfb69beebd31a7e8a9ea0c4b46d2668db092..9e3ed322969b71b3e65fedec84d5f0824b510b41 100644 (file)
--- a/src/lib/subtitle_content.cc
+++ b/src/lib/subtitle_content.cc
@@ -49,13 +49,12 @@ int const SubtitleContentProperty::BURN = 505;
 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)
@@ -65,9 +64,6 @@ SubtitleContent::SubtitleContent (Content* parent)
        , _y_offset (0)
        , _x_scale (1)
        , _y_scale (1)
-       , _outline (false)
-       , _shadow (false)
-       , _effect_colour (0, 0, 0)
        , _line_spacing (1)
        , _outline_width (2)
 {
@@ -103,11 +99,7 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int
        , _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) {
@@ -122,6 +114,25 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int
                _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");
@@ -137,11 +148,12 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int
        }
 
        if (version >= 36) {
-               _effect_colour = dcp::Colour (
-                       node->optional_number_child<int>("EffectRed").get_value_or(255),
-                       node->optional_number_child<int>("EffectGreen").get_value_or(255),
-                       node->optional_number_child<int>("EffectBlue").get_value_or(255)
-                       );
+               optional<int> er = node->optional_number_child<int>("EffectRed");
+               optional<int> eg = node->optional_number_child<int>("EffectGreen");
+               optional<int> eb = node->optional_number_child<int>("EffectBlue");
+               if (er && eg && eb) {
+                       _effect_colour = dcp::Colour (*er, *eg, *eb);
+               }
        } else {
                _effect_colour = dcp::Colour (
                        node->optional_number_child<int>("OutlineRed").get_value_or(255),
@@ -150,6 +162,15 @@ SubtitleContent::SubtitleContent (Content* parent, cxml::ConstNodePtr node, int
                        );
        }
 
+       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");
@@ -256,14 +277,31 @@ SubtitleContent::as_xml (xmlpp::Node* root) const
                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");
-       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));
+       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) {
@@ -279,8 +317,8 @@ SubtitleContent::identifier () const
                + "_" + 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
@@ -339,15 +377,15 @@ SubtitleContent::unset_colour ()
 }
 
 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
@@ -356,6 +394,12 @@ SubtitleContent::set_effect_colour (dcp::Colour colour)
        maybe_set (_effect_colour, colour, SubtitleContentProperty::EFFECT_COLOUR);
 }
 
+void
+SubtitleContent::unset_effect_colour ()
+{
+       maybe_set (_effect_colour, optional<dcp::Colour>(), SubtitleContentProperty::EFFECT_COLOUR);
+}
+
 void
 SubtitleContent::set_use (bool u)
 {
@@ -410,12 +454,24 @@ SubtitleContent::set_fade_in (ContentTime t)
        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)
 {
@@ -437,11 +493,20 @@ SubtitleContent::take_settings_from (shared_ptr<const SubtitleContent> c)
        } else {
                unset_colour ();
        }
-       set_outline (c->_outline);
-       set_shadow (c->_shadow);
-       set_effect_colour (c->_effect_colour);
+       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);
 }