X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.h;h=02afeeb94251132984f24b7ae215e0734433b224;hb=f0956ea1c21b81748af55867698561d12ad2c91b;hp=d45e37fc7c78817abc30f4d1e739ab920156c04f;hpb=a18e837cb56da42a500a438a09afcbddad8b3a94;p=dcpomatic.git

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index d45e37fc7..02afeeb94 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -41,21 +41,20 @@ public:
 	TextDecoder (
 		Decoder* parent,
 		boost::shared_ptr<const TextContent>,
-		boost::shared_ptr<Log> log,
-		ContentTime first
+		dcpomatic::ContentTime first
 		);
 
-	ContentTime position () const {
+	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_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);
-	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 ();
 
@@ -65,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;
+	dcpomatic::ContentTime _position;
 };
 
 #endif