X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=92082ca18b105a62f9dd9aec909625c12ac875c9;hb=5edf916ee0261761efae59782a15e1b453e988e7;hp=d87ff610ac47d3a9eae2eb795ac072a397c26b3f;hpb=e7adac0f25e0d2a38be56e4477ed78b8b34b8b34;p=dcpomatic.git diff --git a/src/lib/decoder.h b/src/lib/decoder.h index d87ff610a..92082ca18 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -26,13 +26,14 @@ #define DCPOMATIC_DECODER_H #include "types.h" +#include "film.h" #include "dcpomatic_time.h" #include class Decoded; class VideoDecoder; class AudioDecoder; -class SubtitleDecoder; +class TextDecoder; class DecoderPart; /** @class Decoder. @@ -41,19 +42,28 @@ class DecoderPart; class Decoder : public boost::noncopyable { public: + Decoder (boost::weak_ptr film); virtual ~Decoder () {} boost::shared_ptr video; boost::shared_ptr audio; - boost::shared_ptr subtitle; + std::list > text; + + boost::shared_ptr only_text () const; /** Do some decoding and perhaps emit video, audio or subtitle data. * @return true if this decoder will emit no more data unless a seek() happens. */ virtual bool pass () = 0; - virtual void seek (ContentTime time, bool accurate); + virtual void seek (dcpomatic::ContentTime time, bool accurate); + + dcpomatic::ContentTime position () const; + +protected: + boost::shared_ptr film () const; - ContentTime position () const; +private: + boost::weak_ptr _film; }; #endif