X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.h;h=6e96b6b914abd109f52a2c3f4af4c161a9cc385f;hb=62f9b78a2eb5f0fc6b9028264bac6ad501d83309;hp=ed276391698e86140a49ec35663e3f7996aa32f0;hpb=9cb73fbc0fa4643612f01665bc6d9fc430656f32;p=dcpomatic.git

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index ed2763916..6e96b6b91 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,8 +18,10 @@
 
 */
 
-#ifndef DCPOMATIC_SUBTITLE_DECODER_H
-#define DCPOMATIC_SUBTITLE_DECODER_H
+
+#ifndef DCPOMATIC_CAPTION_DECODER_H
+#define DCPOMATIC_CAPTION_DECODER_H
+
 
 #include "decoder.h"
 #include "rect.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 {
 		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 (dcpomatic::ContentTime from, std::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
+	void emit_bitmap (dcpomatic::ContentTimePeriod period, std::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
+	void emit_plain_start (dcpomatic::ContentTime from, std::list<dcp::SubtitleString> s);
+	void emit_plain_start (dcpomatic::ContentTime from, sub::Subtitle const & subtitle);
+	void emit_plain (dcpomatic::ContentTimePeriod period, std::list<dcp::SubtitleString> s);
+	void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle);
+	void emit_stop (dcpomatic::ContentTime to);
 
 	void seek ();
 
-	boost::shared_ptr<const TextContent> content () const {
+	std::shared_ptr<const TextContent> content () const {
 		return _content;
 	}
 
-	boost::signals2::signal<void (ContentBitmapCaption)> BitmapStart;
-	boost::signals2::signal<void (ContentTextCaption)> PlainStart;
-	boost::signals2::signal<void (ContentTime, TextType)> Stop;
+	boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
+	boost::signals2::signal<void (ContentStringText)> PlainStart;
+	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