summaryrefslogtreecommitdiff
path: root/src/lib/subtitle_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-01-13 01:00:08 +0000
committerCarl Hetherington <cth@carlh.net>2018-01-13 01:00:08 +0000
commitd54c8291f83bd9f2cf964ca0372f74734ccb0ae2 (patch)
treec7a0b929c444476a6cc430dfb29193cbe181a9be /src/lib/subtitle_decoder.cc
parent9b1c6dd87c2a1b0b480a23da756d22c3bfedd9f1 (diff)
Forcing for fade in/out.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
-rw-r--r--src/lib/subtitle_decoder.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 9351d6865..39c36415a 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -85,8 +85,12 @@ SubtitleDecoder::emit_text_start (ContentTime from, list<dcp::SubtitleString> s)
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));
+ if (content()->fade_in()) {
+ i.set_fade_up_time (dcp::Time(content()->fade_in()->seconds(), 1000));
+ }
+ if (content()->fade_out()) {
+ i.set_fade_down_time (dcp::Time(content()->fade_out()->seconds(), 1000));
+ }
}
TextStart (ContentTextSubtitle (from, s));