projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assorted image subtitle fixes.
[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..9a16fb7c850dcf92e57ddf1ee7a80f8372386dc1 100644
(file)
--- a/
src/lib/dcp_subtitle_decoder.h
+++ b/
src/lib/dcp_subtitle_decoder.h
@@
-18,10
+18,11
@@
*/
#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>);
{
public:
DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>);
@@
-31,7
+32,8
@@
protected:
bool pass ();
private:
bool pass ();
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;