X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.h;h=ae0d0c671f34e9d8e6e97b940abfe750461c4cb7;hb=f2caad0df1a451e2aff68dfd37277faa72116e12;hp=f2f5235168402c136e9c133ac8865c11396a99c7;hpb=2e536ef0971edefea23810b99f7706881072783b;p=dcpomatic.git diff --git a/src/lib/decoder.h b/src/lib/decoder.h index f2f523516..ae0d0c671 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -21,20 +21,17 @@ * @brief Parent class for decoders of content. */ -#ifndef DVDOMATIC_DECODER_H -#define DVDOMATIC_DECODER_H +#ifndef DCPOMATIC_DECODER_H +#define DCPOMATIC_DECODER_H #include #include #include #include #include -#include "util.h" -#include "stream.h" #include "video_source.h" #include "audio_source.h" #include "film.h" -#include "options.h" class Image; class Log; @@ -53,24 +50,26 @@ class FilterGraph; class Decoder { public: - Decoder (boost::shared_ptr, DecodeOptions); + Decoder (boost::shared_ptr); virtual ~Decoder () {} virtual bool pass () = 0; virtual bool seek (double); - virtual bool seek_to_last (); + virtual bool seek_back () { + return true; + } + virtual bool seek_forward () { + return true; + } boost::signals2::signal OutputChanged; protected: - /** our Film */ - boost::shared_ptr _film; - /** our decode options */ - DecodeOptions _opt; + boost::shared_ptr _film; private: virtual void film_changed (Film::Property) {} - + boost::signals2::scoped_connection _film_connection; };