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

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index a26348ee6..142cfa42b 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -33,23 +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 seek (ContentTime, bool);
 	
-	void image_subtitle (ContentTime from, ContentTime to, boost::shared_ptr<Image>, dcpomatic::Rect<double>);
+	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<boost::shared_ptr<T> > get (std::list<boost::shared_ptr<T> > const & subs, ContentTime from, ContentTime to);
+	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