summaryrefslogtreecommitdiff
path: root/src/lib/string_text_file_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-21 02:45:30 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-21 02:45:30 +0000
commit84012cdd64f451891febd36154b7226ea21a899b (patch)
tree096fb898aa14d936dfc8f8598a6908337508233c /src/lib/string_text_file_decoder.cc
parent254b3044d72de6b033d7c584f5abd2b9aa70aad5 (diff)
Put Film pointer into Decoder.
Diffstat (limited to 'src/lib/string_text_file_decoder.cc')
-rw-r--r--src/lib/string_text_file_decoder.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc
index e67450b8b..8c9880b0c 100644
--- a/src/lib/string_text_file_decoder.cc
+++ b/src/lib/string_text_file_decoder.cc
@@ -35,8 +35,9 @@ using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
-StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const StringTextFileContent> content)
- : StringTextFile (content)
+StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content)
+ : Decoder (film)
+ , StringTextFile (content)
, _next (0)
{
ContentTime first;
@@ -47,7 +48,7 @@ StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const StringTextFileCon
}
void
-StringTextFileDecoder::seek (shared_ptr<const Film> film, ContentTime time, bool accurate)
+StringTextFileDecoder::seek (ContentTime time, bool accurate)
{
/* It's worth back-tracking a little here as decoding is cheap and it's nice if we don't miss
too many subtitles when seeking.
@@ -57,7 +58,7 @@ StringTextFileDecoder::seek (shared_ptr<const Film> film, ContentTime time, bool
time = ContentTime();
}
- Decoder::seek (film, time, accurate);
+ Decoder::seek (time, accurate);
_next = 0;
while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
@@ -66,7 +67,7 @@ StringTextFileDecoder::seek (shared_ptr<const Film> film, ContentTime time, bool
}
bool
-StringTextFileDecoder::pass (shared_ptr<const Film>)
+StringTextFileDecoder::pass ()
{
if (_next >= _subtitles.size ()) {
return true;