Updated fr_FR translation from Thierry Journet.

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

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index 73e53e446ba59c8ef5cebc20bb8d26e645e8a6de..58dc51510a8084ba4222e44d810871d32c4334d2 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -76,12 +76,15 @@ public:
        void set_colour (dcp::Colour);
        void unset_colour ();
        void set_effect (dcp::Effect);
+       void unset_effect ();
        void set_effect_colour (dcp::Colour);
        void unset_effect_colour ();
        void set_line_spacing (double s);
        void set_fade_in (ContentTime);
+       void unset_fade_in ();
        void set_fade_out (ContentTime);
        void set_outline_width (int);
+       void unset_fade_out ();
 
        bool use () const {
                boost::mutex::scoped_lock lm (_mutex);
@@ -128,7 +131,7 @@ public:
                return _colour;
        }
 
-       dcp::Effect effect () const {
+       boost::optional<dcp::Effect> effect () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _effect;
        }
@@ -143,12 +146,12 @@ public:
                return _line_spacing;
        }
 
-       ContentTime fade_in () const {
+       boost::optional<ContentTime> fade_in () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fade_in;
        }
 
-       ContentTime fade_out () const {
+       boost::optional<ContentTime> fade_out () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _fade_out;
        }
@@ -189,12 +192,12 @@ private:
        double _y_scale;
        std::list<boost::shared_ptr<Font> > _fonts;
        boost::optional<dcp::Colour> _colour;
-       dcp::Effect _effect;
+       boost::optional<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;
+       boost::optional<ContentTime> _fade_in;
+       boost::optional<ContentTime> _fade_out;
        int _outline_width;
 };