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

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index efa90fd92..142cfa42b 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -33,17 +33,27 @@ class Image;
 class SubtitleDecoder : public virtual Decoder
 {
 public:
-	SubtitleDecoder ();
+	SubtitleDecoder (boost::shared_ptr<const SubtitleContent>);
 
-	std::list<boost::shared_ptr<ContentImageSubtitle> > get_image_subtitles (ContentTime from, ContentTime to);
-	std::list<boost::shared_ptr<ContentTextSubtitle> > get_text_subtitles (ContentTime from, ContentTime to);
+	std::list<ContentImageSubtitle> get_image_subtitles (ContentTimePeriod period, bool starting);
+	std::list<ContentTextSubtitle> get_text_subtitles (ContentTimePeriod period, bool starting);
 
 protected:
-	void image_subtitle (ContentTime from, ContentTime to, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
+	void seek (ContentTime, bool);
+	
+	void image_subtitle (ContentTimePeriod period, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
 	void text_subtitle (std::list<dcp::SubtitleString>);
 
-	std::list<boost::shared_ptr<ContentImageSubtitle> > _decoded_image_subtitles;
-	std::list<boost::shared_ptr<ContentTextSubtitle> > _decoded_text_subtitles;
+	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);
+
+	virtual std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const = 0;
+	
+	boost::shared_ptr<const SubtitleContent> _subtitle_content;
 };
 
 #endif