X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.h;h=3fb27b653e4d279084ea73d9885ec08bc3ff2a68;hb=8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8;hp=a82f43f51af2e3a1ddd8bf1178366241cae51add;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index a82f43f51..3fb27b653 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -40,35 +40,35 @@ class TextDecoder : public DecoderPart
 public:
 	TextDecoder (
 		Decoder* parent,
-		boost::shared_ptr<const TextContent>,
-		ContentTime first
+		std::shared_ptr<const TextContent>,
+		dcpomatic::ContentTime first
 		);
 
-	ContentTime position (boost::shared_ptr<const Film>) 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_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, 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 (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;
+	std::shared_ptr<const TextContent> _content;
+	boost::optional<dcpomatic::ContentTime> _position;
 };
 
 #endif