X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.h;h=ef62d8b88355f73c6a6f4e308e036664296fce1c;hb=69f25e496ba409c02aa27b1e07dfcde34c86a32b;hp=164c151e671089a78140339ed836604f05bb018b;hpb=8102046b2f29e0c7b234c29bf204b056cb30e64f;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 164c151e6..ef62d8b88 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
@@ -35,23 +33,28 @@ class SubtitleDecoder : public virtual Decoder
 public:
 	SubtitleDecoder (boost::shared_ptr<const SubtitleContent>);
 
-	std::list<boost::shared_ptr<ContentImageSubtitle> > get_image_subtitles (ContentTimePeriod period);
-	std::list<boost::shared_ptr<ContentTextSubtitle> > get_text_subtitles (ContentTimePeriod period);
+	std::list<ContentImageSubtitle> get_image_subtitles (ContentTimePeriod period, bool starting, bool accurate);
+	std::list<ContentTextSubtitle> get_text_subtitles (ContentTimePeriod period, bool starting, bool accurate);
 
 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<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;
+	boost::shared_ptr<const SubtitleContent> _subtitle_content;
 
 private:
 	template <class T>
-	std::list<boost::shared_ptr<T> > get (std::list<boost::shared_ptr<T> > const & subs, ContentTimePeriod period);
+	std::list<T> get (std::list<T> const & subs, std::list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting, bool accurate);
 
-	boost::shared_ptr<const SubtitleContent> _subtitle_content;
+	/** @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;
 };
 
 #endif