summaryrefslogtreecommitdiff
path: root/src/lib/subtitle_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-01-12 20:36:46 +0000
committerCarl Hetherington <cth@carlh.net>2018-01-13 00:06:28 +0000
commit9b1c6dd87c2a1b0b480a23da756d22c3bfedd9f1 (patch)
tree37eaa7473aee114872ffb447da23dce28249ad65 /src/lib/subtitle_decoder.cc
parent67a404fff364c6e1fa02eab270755895ba0e1fe8 (diff)
Note whether effect is forced or not.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
-rw-r--r--src/lib/subtitle_decoder.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 90bedf0ce..9351d6865 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -82,7 +82,9 @@ SubtitleDecoder::emit_text_start (ContentTime from, list<dcp::SubtitleString> s)
if (content()->effect_colour()) {
i.set_effect_colour (*content()->effect_colour());
}
- i.set_effect (content()->effect());
+ if (content()->effect()) {
+ 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));
}