Use an enum for the effect in SubtitleContent.

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

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index b071824069282fc997fe52cd1fce873e0c08c023..73e53e446ba59c8ef5cebc20bb8d26e645e8a6de 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -40,8 +40,7 @@ public:
        static int const LANGUAGE;
        static int const FONTS;
        static int const COLOUR;
-       static int const OUTLINE;
-       static int const SHADOW;
+       static int const EFFECT;
        static int const EFFECT_COLOUR;
        static int const LINE_SPACING;
        static int const FADE_IN;
@@ -76,9 +75,9 @@ public:
        void set_language (std::string language);
        void set_colour (dcp::Colour);
        void unset_colour ();
-       void set_outline (bool);
-       void set_shadow (bool);
+       void set_effect (dcp::Effect);
        void set_effect_colour (dcp::Colour);
+       void unset_effect_colour ();
        void set_line_spacing (double s);
        void set_fade_in (ContentTime);
        void set_fade_out (ContentTime);
@@ -129,17 +128,12 @@ public:
                return _colour;
        }
 
-       bool outline () const {
+       dcp::Effect effect () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _outline;
+               return _effect;
        }
 
-       bool shadow () const {
-               boost::mutex::scoped_lock lm (_mutex);
-               return _shadow;
-       }
-
-       dcp::Colour effect_colour () const {
+       boost::optional<dcp::Colour> effect_colour () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _effect_colour;
        }
@@ -195,9 +189,8 @@ private:
        double _y_scale;
        std::list<boost::shared_ptr<Font> > _fonts;
        boost::optional<dcp::Colour> _colour;
-       bool _outline;
-       bool _shadow;
-       dcp::Colour _effect_colour;
+       dcp::Effect _effect;
+       boost::optional<dcp::Colour> _effect_colour;
        /** scaling factor for line spacing; 1 is "standard", < 1 is closer together, > 1 is further apart */
        double _line_spacing;
        ContentTime _fade_in;