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 2aa33f1727f9ec47c24bee577d34b7c544c1c873..73e53e446ba59c8ef5cebc20bb8d26e645e8a6de 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -40,8 +40,12 @@ public:
        static int const LANGUAGE;
        static int const FONTS;
        static int const COLOUR;
-       static int const OUTLINE;
-       static int const OUTLINE_COLOUR;
+       static int const EFFECT;
+       static int const EFFECT_COLOUR;
+       static int const LINE_SPACING;
+       static int const FADE_IN;
+       static int const FADE_OUT;
+       static int const OUTLINE_WIDTH;
 };
 
 /** @class SubtitleContent
@@ -58,6 +62,7 @@ public:
 
        void as_xml (xmlpp::Node *) const;
        std::string identifier () const;
+       void take_settings_from (boost::shared_ptr<const SubtitleContent> c);
 
        void add_font (boost::shared_ptr<Font> font);
 
@@ -68,6 +73,15 @@ public:
        void set_x_scale (double);
        void set_y_scale (double);
        void set_language (std::string language);
+       void set_colour (dcp::Colour);
+       void unset_colour ();
+       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);
+       void set_outline_width (int);
 
        bool use () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -109,25 +123,39 @@ public:
                return _language;
        }
 
-       void set_colour (dcp::Colour);
-
-       dcp::Colour colour () const {
+       boost::optional<dcp::Colour> colour () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _colour;
        }
 
-       void set_outline (bool);
+       dcp::Effect effect () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _effect;
+       }
+
+       boost::optional<dcp::Colour> effect_colour () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _effect_colour;
+       }
+
+       double line_spacing () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _line_spacing;
+       }
 
-       bool outline () const {
+       ContentTime fade_in () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _outline;
+               return _fade_in;
        }
 
-       void set_outline_colour (dcp::Colour);
+       ContentTime fade_out () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _fade_out;
+       }
 
-       dcp::Colour outline_colour () const {
+       int outline_width () const {
                boost::mutex::scoped_lock lm (_mutex);
-               return _outline_colour;
+               return _outline_width;
        }
 
        static boost::shared_ptr<SubtitleContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
@@ -143,6 +171,8 @@ private:
        void font_changed ();
        void connect_to_fonts ();
 
+       std::list<boost::signals2::connection> _font_connections;
+
        bool _use;
        bool _burn;
        /** x offset for placing subtitles, as a proportion of the container width;
@@ -158,10 +188,14 @@ private:
        /** y scale factor to apply to subtitles */
        double _y_scale;
        std::list<boost::shared_ptr<Font> > _fonts;
-       dcp::Colour _colour;
-       bool _outline;
-       dcp::Colour _outline_colour;
-       std::list<boost::signals2::connection> _font_connections;
+       boost::optional<dcp::Colour> _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;
+       ContentTime _fade_out;
+       int _outline_width;
 };
 
 #endif