diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-01-12 12:48:50 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-01-13 00:06:28 +0000 |
| commit | 10818d95000c291af776ed9ba1c847257ded4b1f (patch) | |
| tree | aa22b0c81dc0af1d30b8df952e876b7f2353522c /src/lib/subtitle_content.h | |
| parent | 199ac062ed945192f2909bd4fbaa629d57a256c9 (diff) | |
Note whether subtitle colour is forced or not.
Diffstat (limited to 'src/lib/subtitle_content.h')
| -rw-r--r-- | src/lib/subtitle_content.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h index 2fc6d0fd6..b07182406 100644 --- 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. @@ -75,6 +75,7 @@ public: void set_y_scale (double); 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_colour (dcp::Colour); @@ -123,7 +124,7 @@ public: return _language; } - dcp::Colour colour () const { + boost::optional<dcp::Colour> colour () const { boost::mutex::scoped_lock lm (_mutex); return _colour; } @@ -193,7 +194,7 @@ private: /** y scale factor to apply to subtitles */ double _y_scale; std::list<boost::shared_ptr<Font> > _fonts; - dcp::Colour _colour; + boost::optional<dcp::Colour> _colour; bool _outline; bool _shadow; dcp::Colour _effect_colour; |