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

diff --git a/src/lib/dcp_subtitle_decoder.h b/src/lib/dcp_subtitle_decoder.h
index 070562458..9a16fb7c8 100644
--- a/src/lib/dcp_subtitle_decoder.h
+++ b/src/lib/dcp_subtitle_decoder.h
@@ -18,10 +18,11 @@
 */
 
 #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>);
@@ -31,7 +32,8 @@ protected:
 	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;