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_decoder.cc | |
| parent | 199ac062ed945192f2909bd4fbaa629d57a256c9 (diff) | |
Note whether subtitle colour is forced or not.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index 3de097215..eecfce19d 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -75,8 +75,10 @@ SubtitleDecoder::emit_text_start (ContentTime from, list<dcp::SubtitleString> s) boost::algorithm::replace_all (t, ">", ">"); i.set_text (t); - /* Force our configured appearance */ - i.set_colour (content()->colour()); + /* Set any forced appearance */ + if (content()->colour()) { + i.set_colour (*content()->colour()); + } i.set_effect_colour (content()->effect_colour()); if (content()->outline()) { i.set_effect (dcp::BORDER); |