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

diff --git a/src/lib/subtitle_decoder.h b/src/lib/subtitle_decoder.h
index 31b03b066..142cfa42b 100644
--- a/src/lib/subtitle_decoder.h
+++ b/src/lib/subtitle_decoder.h
@@ -20,27 +20,40 @@
 #ifndef DCPOMATIC_SUBTITLE_DECODER_H
 #define DCPOMATIC_SUBTITLE_DECODER_H
 
-#include <boost/signals2.hpp>
-#include <libdcp/subtitle_asset.h>
+#include <dcp/subtitle_string.h>
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
+#include "content_subtitle.h"
 
 class Film;
-class TimedSubtitle;
+class DCPTimedSubtitle;
 class Image;
 
 class SubtitleDecoder : public virtual Decoder
 {
 public:
-	SubtitleDecoder (boost::shared_ptr<const Film>);
+	SubtitleDecoder (boost::shared_ptr<const SubtitleContent>);
 
-	boost::signals2::signal<void (boost::shared_ptr<Image>, dcpomatic::Rect<double>, Time, Time)> ImageSubtitle;
-	boost::signals2::signal<void (std::list<libdcp::Subtitle>)> TextSubtitle;
+	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>, Time, Time);
-	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, ContentTimePeriod period, bool starting);
+
+	virtual std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const = 0;
+	
+	boost::shared_ptr<const SubtitleContent> _subtitle_content;
 };
 
 #endif