diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-01-12 20:36:46 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-01-13 00:06:28 +0000 |
| commit | 9b1c6dd87c2a1b0b480a23da756d22c3bfedd9f1 (patch) | |
| tree | 37eaa7473aee114872ffb447da23dce28249ad65 /src/lib/subtitle_content.h | |
| parent | 67a404fff364c6e1fa02eab270755895ba0e1fe8 (diff) | |
Note whether effect is forced or not.
Diffstat (limited to 'src/lib/subtitle_content.h')
| -rw-r--r-- | src/lib/subtitle_content.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h index 73e53e446..47b7b5cd9 100644 --- a/src/lib/subtitle_content.h +++ b/src/lib/subtitle_content.h @@ -76,6 +76,7 @@ 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); @@ -128,7 +129,7 @@ public: return _colour; } - dcp::Effect effect () const { + boost::optional<dcp::Effect> effect () const { boost::mutex::scoped_lock lm (_mutex); return _effect; } @@ -189,7 +190,7 @@ 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; |