From 99b4e0705e9007aabfec08ea2c8d1a84eda0d32e Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 12 Jan 2018 13:04:46 +0000
Subject: Note whether subtitle effect colour is forced or not.

---
 src/lib/subtitle_content.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/lib/subtitle_content.h')

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index b07182406..baf412bb6 100644
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -79,6 +79,7 @@ public:
 	void set_outline (bool);
 	void set_shadow (bool);
 	void set_effect_colour (dcp::Colour);
+	void unset_effect_colour ();
 	void set_line_spacing (double s);
 	void set_fade_in (ContentTime);
 	void set_fade_out (ContentTime);
@@ -139,7 +140,7 @@ public:
 		return _shadow;
 	}
 
-	dcp::Colour effect_colour () const {
+	boost::optional<dcp::Colour> effect_colour () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _effect_colour;
 	}
@@ -197,7 +198,7 @@ private:
 	boost::optional<dcp::Colour> _colour;
 	bool _outline;
 	bool _shadow;
-	dcp::Colour _effect_colour;
+	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;
-- 
cgit v1.2.3