X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftext_decoder.h;h=a82f43f51af2e3a1ddd8bf1178366241cae51add;hb=96bf7c6530260c7c404499dc697c7a47fb15c3b7;hp=96eba80e2ca527442357ec87921f36f1ae3b4812;hpb=0ab83642f0c96ae2681beae04873b3226338a570;p=dcpomatic.git

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index 96eba80e2..a82f43f51 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-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,8 +18,8 @@
 
 */
 
-#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"
@@ -41,15 +41,15 @@ public:
 	TextDecoder (
 		Decoder* parent,
 		boost::shared_ptr<const TextContent>,
-		boost::shared_ptr<Log> log,
 		ContentTime first
 		);
 
-	ContentTime position () const {
+	ContentTime position (boost::shared_ptr<const Film>) const {
 		return _position;
 	}
 
 	void emit_bitmap_start (ContentTime from, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
+	void emit_bitmap (ContentTimePeriod period, 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);
@@ -63,8 +63,8 @@ public:
 	}
 
 	boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
-	boost::signals2::signal<void (ContentPlainText)> PlainStart;
-	boost::signals2::signal<void (ContentTime, TextType)> Stop;
+	boost::signals2::signal<void (ContentStringText)> PlainStart;
+	boost::signals2::signal<void (ContentTime)> Stop;
 
 private:
 	boost::shared_ptr<const TextContent> _content;