X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.h;h=8ba74404f2d26dbc3a80c9494c20dd233e9396ef;hb=7cd7b360169493d864206e2cdfb4f688cf5a12cf;hp=82662d192fbd1295d8574d7001b44d413984c353;hpb=4ba8772aef261da209bbb882325fd61a8b479fd7;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 82662d192..8ba74404f 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -20,12 +20,11 @@
 #ifndef DCPOMATIC_SUBTITLE_DECODER_H
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
-#include <boost/signals2.hpp>
-#include <libdcp/subtitle_asset.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
-#include "decoded.h"
+#include "content_subtitle.h"
+#include <dcp/subtitle_string.h>
 
 class Film;
 class DCPTimedSubtitle;
@@ -34,11 +33,31 @@ class Image;
 class SubtitleDecoder : public virtual Decoder
 {
 public:
-	SubtitleDecoder (boost::shared_ptr<const Film>);
+	SubtitleDecoder (boost::shared_ptr<const SubtitleContent>);
+
+	std::list<ContentImageSubtitle> get_image_subtitles (ContentTimePeriod period, bool starting);
+	std::list<ContentTextSubtitle> get_text_subtitles (ContentTimePeriod period, bool starting);
 
 protected:
-	void image_subtitle (boost::shared_ptr<Image>, dcpomatic::Rect<double>, ContentTime, ContentTime);
-	void text_subtitle (std::list<libdcp::Subtitle>);
+	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<ContentImageSubtitle> _decoded_image_subtitles;
+	std::list<ContentTextSubtitle> _decoded_text_subtitles;
+
+private:
+	template <class T>
+	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;
+	
+	boost::shared_ptr<const SubtitleContent> _subtitle_content;
 };
 
 #endif