X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_decoder.h;h=fb2213fa271d2f933d981d042ce268130aaf653f;hp=070562458b64d396468728892c438027637756bc;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=cf8bbea2de38c4e9ac140f55b27311b7b6dcd814

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 070562458..fb2213fa2 100644
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -18,20 +18,23 @@
 */
 
 #include "subtitle_decoder.h"
+#include "dcp_subtitle.h"
 
 class DCPSubtitleContent;
 
-class DCPSubtitleDecoder : public SubtitleDecoder
+class DCPSubtitleDecoder : public SubtitleDecoder, public DCPSubtitle
 {
 public:
 	DCPSubtitleDecoder (boost::shared_ptr<const DCPSubtitleContent>);
 
 protected:
-	void seek (ContentTime time, bool accurate);
 	bool pass ();
+	void seek (ContentTime time, bool accurate);
 
 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;
+	ContentTimePeriod content_time_period (dcp::SubtitleString s) const;
 
 	std::list<dcp::SubtitleString> _subtitles;
 	std::list<dcp::SubtitleString>::const_iterator _next;