diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-12-09 21:51:36 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-12-09 21:51:36 +0000 |
| commit | 936ff6927ad24daf0ed20776b19b6faa3df9bf83 (patch) | |
| tree | 556123d229c916251ddc96f9a8b3164b4d815e9b /src/lib/subtitle_decoder.cc | |
| parent | d7013785f7a1d86feb471af826419afa6298e2b8 (diff) | |
| parent | 5757f3ba9d2cf3948bcad2b3f3ddbbf09ad754a5 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index 9ec030b38..c59406c36 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -63,6 +63,7 @@ void SubtitleDecoder::give_image (ContentTimePeriod period, shared_ptr<Image> image, dcpomatic::Rect<double> rect) { _decoded_image.push_back (ContentImageSubtitle (period, image, rect)); + _position = period.from; } void @@ -79,6 +80,7 @@ SubtitleDecoder::give_text (ContentTimePeriod period, list<dcp::SubtitleString> } _decoded_text.push_back (ContentTextSubtitle (period, s)); + _position = period.from; } /** Get the subtitles that correspond to a given list of periods. @@ -168,6 +170,7 @@ SubtitleDecoder::seek (ContentTime t, bool) { _log->log (String::compose ("SD seek to %1", to_string(t)), LogEntry::TYPE_DEBUG_DECODE); reset (); + _position.reset (); } void |