diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-01-12 13:24:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-01-13 00:06:28 +0000 |
| commit | 67a404fff364c6e1fa02eab270755895ba0e1fe8 (patch) | |
| tree | 06de621b56c0b3beac7f15316273caef57e9d7e1 /src/lib/subtitle_decoder.cc | |
| parent | 99b4e0705e9007aabfec08ea2c8d1a84eda0d32e (diff) | |
Use an enum for the effect in SubtitleContent.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index 8badf5183..90bedf0ce 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -82,11 +82,7 @@ SubtitleDecoder::emit_text_start (ContentTime from, list<dcp::SubtitleString> s) if (content()->effect_colour()) { i.set_effect_colour (*content()->effect_colour()); } - if (content()->outline()) { - i.set_effect (dcp::BORDER); - } else if (content()->shadow()) { - i.set_effect (dcp::SHADOW); - } + i.set_effect (content()->effect()); i.set_fade_up_time (dcp::Time(content()->fade_in().seconds(), 1000)); i.set_fade_down_time (dcp::Time(content()->fade_out().seconds(), 1000)); } |