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

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 142cfa42b..d01c4e45b 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -20,14 +20,12 @@
 #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;
 class Image;
 
 class SubtitleDecoder : public virtual Decoder
@@ -40,19 +38,23 @@ 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>);
+	void text_subtitle (ContentTimePeriod period, std::list<dcp::SubtitleString>);
 
 	std::list<ContentImageSubtitle> _decoded_image_subtitles;
 	std::list<ContentTextSubtitle> _decoded_text_subtitles;
 
 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;
 };