projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix FFmpeg subtitle stream serialisation.
[dcpomatic.git]
/
src
/
lib
/
dcp_subtitle_decoder.h
diff --git
a/src/lib/dcp_subtitle_decoder.h
b/src/lib/dcp_subtitle_decoder.h
index 070562458b64d396468728892c438027637756bc..52e40041683f61119a7445dc0fcc11d1ff1b9387 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.h
+++ b/
src/lib/dcp_subtitle_decoder.h
@@
-18,20
+18,22
@@
*/
#include "subtitle_decoder.h"
*/
#include "subtitle_decoder.h"
+#include "dcp_subtitle.h"
class DCPSubtitleContent;
class DCPSubtitleContent;
-class DCPSubtitleDecoder : public SubtitleDecoder
+class DCPSubtitleDecoder : public SubtitleDecoder
, public DCPSubtitle
{
public:
DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>);
protected:
{
public:
DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>);
protected:
+ bool pass (PassReason);
void seek (ContentTime time, bool accurate);
void seek (ContentTime time, bool accurate);
- bool pass ();
private:
private:
- std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+ std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+ std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
std::list<dcp::SubtitleString> _subtitles;
std::list<dcp::SubtitleString>::const_iterator _next;
std::list<dcp::SubtitleString> _subtitles;
std::list<dcp::SubtitleString>::const_iterator _next;