diff options
Diffstat (limited to 'src/lib/subtitle_content.h')
| -rw-r--r-- | src/lib/subtitle_content.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h index baf412bb6..73e53e446 100644 --- 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,8 +75,7 @@ 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); @@ -130,14 +128,9 @@ public: return _colour; } - bool outline () const { + dcp::Effect effect () const { boost::mutex::scoped_lock lm (_mutex); - return _outline; - } - - bool shadow () const { - boost::mutex::scoped_lock lm (_mutex); - return _shadow; + return _effect; } boost::optional<dcp::Colour> effect_colour () const { @@ -196,8 +189,7 @@ private: double _y_scale; std::list<boost::shared_ptr<Font> > _fonts; boost::optional<dcp::Colour> _colour; - bool _outline; - bool _shadow; + 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; |