X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ftext_decoder.h;h=9b3050f718b56ad8f4fd65e1397d01a3fe2ee850;hb=0f9f004c50a8bea6b87d5a1636f95f67066e5187;hp=96b335de14397ac1c9644ad4feb7dd3e150ee615;hpb=ff27a57f028b0ab967e38c555fbfcdca560f15fd;p=dcpomatic.git diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h index 96b335de1..9b3050f71 100644 --- a/src/lib/text_decoder.h +++ b/src/lib/text_decoder.h @@ -42,11 +42,7 @@ class Image; class TextDecoder : public DecoderPart { public: - TextDecoder ( - Decoder* parent, - std::shared_ptr, - dcpomatic::ContentTime first - ); + TextDecoder (Decoder* parent, std::shared_ptr); boost::optional position (std::shared_ptr) const override { return _position; @@ -54,12 +50,14 @@ public: void emit_bitmap_start (ContentBitmapText const& bitmap); void emit_bitmap (dcpomatic::ContentTimePeriod period, std::shared_ptr image, dcpomatic::Rect rect); - void emit_plain_start (dcpomatic::ContentTime from, std::list s); + void emit_plain_start (dcpomatic::ContentTime from, std::vector s, dcp::Standard valign_standard); void emit_plain_start (dcpomatic::ContentTime from, sub::Subtitle const & subtitle); - void emit_plain (dcpomatic::ContentTimePeriod period, std::list s); + void emit_plain (dcpomatic::ContentTimePeriod period, std::vector s, dcp::Standard valign_standard); void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle); void emit_stop (dcpomatic::ContentTime to); + void maybe_set_position (dcpomatic::ContentTime position); + void seek () override; std::shared_ptr content () const {