summaryrefslogtreecommitdiff
path: root/src/lib/subtitle_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-08-16 08:41:25 +0100
committerCarl Hetherington <cth@carlh.net>2016-08-16 16:56:32 +0100
commit94b3924ed3cbf4fbfa2445ca1007f25c53dc8b60 (patch)
tree40abbdf14043edf4d6592b82acf3eccb960ea71f /src/lib/subtitle_decoder.cc
parent03c5a8155043613c01e0e151735a7fcf8ab84415 (diff)
Basic support for fading subtitles in and out (#923).
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
-rw-r--r--src/lib/subtitle_decoder.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 5ae1a703e..ba6fe4600 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -245,8 +245,8 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt
j.text,
effect,
content()->effect_colour(),
- dcp::Time (0, 1000),
- dcp::Time (0, 1000)
+ dcp::Time (content()->fade_in().seconds(), 1000),
+ dcp::Time (content()->fade_out().seconds(), 1000)
)
);
}