X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.h;h=607d9e194f95cadef876c147b2b151ce59fbcc3f;hb=2975fa5cd5dcfaa806b07ef39c8900e07f417658;hp=25125e701ae07d5365fbe1a444ae44f507e2311f;hpb=df17bbd25da69fc38eb2dcd8b4a2531cf0bab0bc;p=dcpomatic.git

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index 25125e701..607d9e194 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,11 @@
 
 */
 
+
 #ifndef DCPOMATIC_CAPTION_DECODER_H
 #define DCPOMATIC_CAPTION_DECODER_H
 
+
 #include "decoder.h"
 #include "rect.h"
 #include "types.h"
@@ -29,46 +31,49 @@
 #include <dcp/subtitle_string.h>
 #include <boost/signals2.hpp>
 
+
 namespace sub {
 	class Subtitle;
 }
 
 class Image;
 
+
 class TextDecoder : public DecoderPart
 {
 public:
 	TextDecoder (
 		Decoder* parent,
-		boost::shared_ptr<const TextContent>,
-		boost::shared_ptr<Log> log,
-		ContentTime first
+		std::shared_ptr<const TextContent>,
+		dcpomatic::ContentTime first
 		);
 
-	ContentTime position () const {
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override {
 		return _position;
 	}
 
-	void emit_bitmap_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
-	void emit_plain_start (ContentTime from, std::list<dcp::SubtitleString> s);
-	void emit_plain_start (ContentTime from, sub::Subtitle const & subtitle);
-	void emit_plain (ContentTimePeriod period, std::list<dcp::SubtitleString> s);
-	void emit_plain (ContentTimePeriod period, sub::Subtitle const & subtitle);
-	void emit_stop (ContentTime to);
+	void emit_bitmap_start (ContentBitmapText const& bitmap);
+	void emit_bitmap (dcpomatic::ContentTimePeriod period, std::shared_ptr<const Image> image, dcpomatic::Rect<double> rect);
+	void emit_plain_start (dcpomatic::ContentTime from, std::vector<dcp::SubtitleString> s);
+	void emit_plain_start (dcpomatic::ContentTime from, sub::Subtitle const & subtitle);
+	void emit_plain (dcpomatic::ContentTimePeriod period, std::vector<dcp::SubtitleString> s);
+	void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle);
+	void emit_stop (dcpomatic::ContentTime to);
 
-	void seek ();
+	void seek () override;
 
-	boost::shared_ptr<const TextContent> content () const {
+	std::shared_ptr<const TextContent> content () const {
 		return _content;
 	}
 
 	boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
 	boost::signals2::signal<void (ContentStringText)> PlainStart;
-	boost::signals2::signal<void (ContentTime, TextType)> Stop;
+	boost::signals2::signal<void (dcpomatic::ContentTime)> Stop;
 
 private:
-	boost::shared_ptr<const TextContent> _content;
-	ContentTime _position;
+	std::shared_ptr<const TextContent> _content;
+	boost::optional<dcpomatic::ContentTime> _position;
 };
 
+
 #endif