X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.h;h=fba9b59472b74047db2d45761321582a833faf7e;hp=d8a64157e9f7f96ea48456312a6818ce34cff8f0;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=7962e6cfd5fbd97e1e44aebe3fc190c62da027e9

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index d8a64157e..fba9b5947 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.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 ();
 
@@ -64,11 +64,11 @@ public:
 
 	boost::signals2::signal<void (ContentBitmapText)> BitmapStart;
 	boost::signals2::signal<void (ContentStringText)> PlainStart;
-	boost::signals2::signal<void (ContentTime)> Stop;
+	boost::signals2::signal<void (dcpomatic::ContentTime)> Stop;
 
 private:
 	boost::shared_ptr<const TextContent> _content;
-	ContentTime _position;
+	boost::optional<dcpomatic::ContentTime> _position;
 };
 
 #endif