diff options
Diffstat (limited to 'src/lib/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 2bc462c33..02ccaa42b 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -21,8 +21,8 @@ * @brief Parent class for decoders of content. */ -#ifndef DVDOMATIC_DECODER_H -#define DVDOMATIC_DECODER_H +#ifndef DCPOMATIC_DECODER_H +#define DCPOMATIC_DECODER_H #include <vector> #include <string> @@ -30,11 +30,9 @@ #include <boost/shared_ptr.hpp> #include <boost/signals2.hpp> #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,26 +51,26 @@ class FilterGraph; class Decoder { public: - Decoder (boost::shared_ptr<Film>, DecodeOptions); + Decoder (boost::shared_ptr<const Film>); virtual ~Decoder () {} virtual bool pass () = 0; virtual bool seek (double); - virtual bool seek_to_last (); - virtual void seek_back () {} - virtual void seek_forward () {} + virtual bool seek_back () { + return true; + } + virtual bool seek_forward () { + return true; + } boost::signals2::signal<void()> OutputChanged; protected: - /** our Film */ - boost::shared_ptr<Film> _film; - /** our decode options */ - DecodeOptions _opt; + boost::shared_ptr<const Film> _film; private: virtual void film_changed (Film::Property) {} - + boost::signals2::scoped_connection _film_connection; }; |