diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-07 20:13:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-07 20:13:22 +0000 |
| commit | cab9a1d569396065a6e9eb39386736908564d6b4 (patch) | |
| tree | ef698f132e659ab34a8783771ddc522481cbe48b /src/lib/decoder.h | |
| parent | 978be856218cc15f059b7e267811e7302c37b24d (diff) | |
Add primitive subtitle view. Remove unused Film member from Decoder hierarchy.
Diffstat (limited to 'src/lib/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index aeb39d0b2..0f14dbba7 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -30,7 +30,6 @@ #include "types.h" #include "dcpomatic_time.h" -class Film; class Decoded; /** @class Decoder. @@ -39,7 +38,7 @@ class Decoded; class Decoder : public boost::noncopyable { public: - Decoder (boost::shared_ptr<const Film>); + Decoder (); virtual ~Decoder () {} /** Seek so that the next peek() will yield the next thing @@ -67,9 +66,6 @@ protected: virtual bool pass () = 0; virtual void flush () {}; - /** The Film that we are decoding in */ - boost::weak_ptr<const Film> _film; - std::list<boost::shared_ptr<Decoded> > _pending; bool _done; }; |
