diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-11-27 20:28:26 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-11-27 20:28:26 +0000 |
| commit | 84cab4dbc3beba84ba53cec1054ede7c250a4c9c (patch) | |
| tree | 9f78d4b375e4aaa941610311a3a856e8d12b4481 /src/lib/writer.cc | |
| parent | aec8cf0f4f2a3e0913804a60695662973c21d5c3 (diff) | |
Fix reel that subtitles are put in when they are exactly on a reel boundary.
Diffstat (limited to 'src/lib/writer.cc')
| -rw-r--r-- | src/lib/writer.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index ab5d3504c..17bd21daf 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -150,6 +150,12 @@ Writer::write (Data encoded, Frame frame, Eyes eyes) _empty_condition.notify_all (); } +bool +Writer::can_repeat (Frame frame) const +{ + return frame > _reels[video_reel(frame)].start(); +} + /** Repeat the last frame that was written to a reel as a new frame. * @param frame Frame index within the DCP of the new (repeated) frame. * @param eyes Eyes that this repeated frame image is for. @@ -519,7 +525,7 @@ Writer::write (PlayerSubtitles subs) return; } - if (_subtitle_reel->period().to < subs.from) { + if (_subtitle_reel->period().to <= subs.from) { ++_subtitle_reel; } |
