X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.h;h=fba9b59472b74047db2d45761321582a833faf7e;hp=f9d021b3f22581f79b5a921abf06358d06e0db44;hb=6ef1fc5f40567650ca9ef2b7644e4fdd97640ae6;hpb=491176352b80bea000564e6662738722185be721

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index f9d021b3f..fba9b5947 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,20 +41,20 @@ public:
 	TextDecoder (
 		Decoder* parent,
 		boost::shared_ptr<const TextContent>,
-		boost::shared_ptr<Log> log,
-		ContentTime first
+		dcpomatic::ContentTime first
 		);
 
-	ContentTime position () const {
+	boost::optional<dcpomatic::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_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, boost::shared_ptr<Image> image, dcpomatic::Rect<double> rect);
+	void emit_bitmap (dcpomatic::ContentTimePeriod period, boost::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 ();
 
@@ -63,12 +63,12 @@ public:
 	}
 
 	boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
-	boost::signals2::signal<void (ContentPlainText)> PlainStart;
-	boost::signals2::signal<void (ContentTime)> Stop;
+	boost::signals2::signal<void (ContentStringText)> PlainStart;
+	boost::signals2::signal<void (dcpomatic::ContentTime)> Stop;
 
 private:
 	boost::shared_ptr<const TextContent> _content;
-	ContentTime _position;
+	boost::optional<dcpomatic::ContentTime> _position;
 };
 
 #endif