summaryrefslogtreecommitdiff
path: root/src/lib/subtitle_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-12-08 11:23:58 +0000
committerCarl Hetherington <cth@carlh.net>2016-12-08 11:23:58 +0000
commita28ef704adf8c5bfa45b3d6285f741af64758ceb (patch)
tree04c1afa7b6a72f7faabe290d14713d242b867ab1 /src/lib/subtitle_decoder.cc
parent804f43474bba7008bf68fc9189793c89c512a944 (diff)
Further fixes and tidying to 'better-seek'.
This fixes the failure to keep track of the `position' of each stream of a multi-stream file. It also tidies things up a bit.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
-rw-r--r--src/lib/subtitle_decoder.cc3
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