projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
[dcpomatic.git]
/
src
/
lib
/
subrip_decoder.h
diff --git
a/src/lib/subrip_decoder.h
b/src/lib/subrip_decoder.h
index d6c6e6bc2fa7fd37df7c4769c572fedaa7a7823c..ad9d04e4003029f6a9b99b62714b4fbdd0a13a6f 100644
(file)
--- a/
src/lib/subrip_decoder.h
+++ b/
src/lib/subrip_decoder.h
@@
-35,7
+35,7
@@
protected:
bool pass ();
private:
-
bool has_subtitle_during (ContentTimePeriod
) const;
+
std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting
) const;
size_t _next;
};