X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.h;h=c958419c75e6b0dcb4fc1a3a20f2996248ca8524;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=142cfa42b766b0813fb1570d530268d886beee2c;hpb=b6c780d3107557d452c6612d715d01e2be52dbda;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 142cfa42b..c958419c7 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -20,11 +20,11 @@
 #ifndef DCPOMATIC_SUBTITLE_DECODER_H
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
-#include <dcp/subtitle_string.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
 #include "content_subtitle.h"
+#include <dcp/subtitle_string.h>
 
 class Film;
 class DCPTimedSubtitle;
@@ -40,7 +40,7 @@ public:
 
 protected:
 	void seek (ContentTime, bool);
-	
+
 	void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
 	void text_subtitle (std::list<dcp::SubtitleString>);
 
@@ -49,10 +49,14 @@ protected:
 
 private:
 	template <class T>
-	std::list<T> get (std::list<T> const & subs, ContentTimePeriod period, bool starting);
+	std::list<T> get (std::list<T> const & subs, std::list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting);
+
+	/** @param starting true if we want only subtitles that start during the period, otherwise
+	 *  we want subtitles that overlap the period.
+	 */
+	virtual std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod period, bool starting) const = 0;
+	virtual std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod period, bool starting) const = 0;
 
-	virtual std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const = 0;
-	
 	boost::shared_ptr<const SubtitleContent> _subtitle_content;
 };