X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ftext_decoder.h;h=9b3050f718b56ad8f4fd65e1397d01a3fe2ee850;hb=d5e6fa029f1fb7b7dccd32dd2906a0858a876cae;hp=6e96b6b914abd109f52a2c3f4af4c161a9cc385f;hpb=8963f0007af1a312017b9627c18b82ec2a577591;p=dcpomatic.git

diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index 6e96b6b91..9b3050f71 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -42,25 +42,23 @@ class Image;
 class TextDecoder : public DecoderPart
 {
 public:
-	TextDecoder (
-		Decoder* parent,
-		std::shared_ptr<const TextContent>,
-		dcpomatic::ContentTime first
-		);
+	TextDecoder (Decoder* parent, std::shared_ptr<const TextContent>);
 
-	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const {
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override {
 		return _position;
 	}
 
-	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_bitmap_start (ContentBitmapText const& bitmap);
+	void emit_bitmap (dcpomatic::ContentTimePeriod period, std::shared_ptr<const Image> image, dcpomatic::Rect<double> rect);
+	void emit_plain_start (dcpomatic::ContentTime from, std::vector<dcp::SubtitleString> s, dcp::Standard valign_standard);
 	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, std::vector<dcp::SubtitleString> s, dcp::Standard valign_standard);
 	void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle);
 	void emit_stop (dcpomatic::ContentTime to);
 
-	void seek ();
+	void maybe_set_position (dcpomatic::ContentTime position);
+
+	void seek () override;
 
 	std::shared_ptr<const TextContent> content () const {
 		return _content;