projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Basic support for fading subtitles in and out (#923).
[dcpomatic.git]
/
src
/
lib
/
subtitle_decoder.cc
diff --git
a/src/lib/subtitle_decoder.cc
b/src/lib/subtitle_decoder.cc
index 5ae1a703eb22e40a28b55dd0aff655bec4782755..ba6fe460034c2f38dd0df54cf4314349dcfb369b 100644
(file)
--- 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)
)
);
}