Make burnt-in subtitle outline width configurable (#940).

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

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index c8492b91a32359c3eea8262cb00a3e32d516ba90..7278b540892681fecff8a9d038c04970b3a79700 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -44,6 +44,9 @@ public:
        static int const SHADOW;
        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
@@ -60,6 +63,7 @@ public:
 
        void as_xml (xmlpp::Node *) const;
        std::string identifier () const;
+       void use_template (boost::shared_ptr<const SubtitleContent> c);
 
        void add_font (boost::shared_ptr<Font> font);
 
@@ -70,6 +74,14 @@ public:
        void set_x_scale (double);
        void set_y_scale (double);
        void set_language (std::string language);
+       void set_colour (dcp::Colour);
+       void set_outline (bool);
+       void set_shadow (bool);
+       void set_effect_colour (dcp::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);
@@ -111,41 +123,46 @@ public:
                return _language;
        }
 
-       void set_colour (dcp::Colour);
-
        dcp::Colour colour () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _colour;
        }
 
-       void set_outline (bool);
-
        bool outline () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _outline;
        }
 
-       void set_shadow (bool);
-
        bool shadow () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _shadow;
        }
 
-       void set_effect_colour (dcp::Colour);
-
        dcp::Colour effect_colour () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _effect_colour;
        }
 
-       void set_line_spacing (double s);
-
        double line_spacing () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _line_spacing;
        }
 
+       ContentTime fade_in () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _fade_in;
+       }
+
+       ContentTime fade_out () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _fade_out;
+       }
+
+       int outline_width () const {
+               boost::mutex::scoped_lock lm (_mutex);
+               return _outline_width;
+       }
+
        static boost::shared_ptr<SubtitleContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
 
 protected:
@@ -159,6 +176,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;
@@ -178,9 +197,11 @@ private:
        bool _outline;
        bool _shadow;
        dcp::Colour _effect_colour;
-       std::list<boost::signals2::connection> _font_connections;
        /** 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