diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-06 21:36:37 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-12-07 01:20:25 +0100 |
| commit | dfb68bf9190ec0be31f01b61c17aebc8b6e30ad8 (patch) | |
| tree | 7df185b2773729f244ab19622f10eb5f746b661f /src/lib/decoder.h | |
| parent | 7c27dff5817715965e86798108c596f9a1675394 (diff) | |
Add WeakFilm and WeakConstFilm and use them a bit.
Diffstat (limited to 'src/lib/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 316109ebb..97de208b2 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -28,6 +28,7 @@ #include "types.h" #include "film.h" #include "dcpomatic_time.h" +#include "weak_film.h" #include <boost/utility.hpp> class Decoded; @@ -40,7 +41,7 @@ class DecoderPart; /** @class Decoder. * @brief Parent class for decoders of content. */ -class Decoder : public boost::noncopyable +class Decoder : public boost::noncopyable, public WeakConstFilm { public: Decoder (boost::weak_ptr<const Film> film); @@ -60,12 +61,6 @@ public: virtual void seek (dcpomatic::ContentTime time, bool accurate); virtual dcpomatic::ContentTime position () const; - -protected: - boost::shared_ptr<const Film> film () const; - -private: - boost::weak_ptr<const Film> _film; }; #endif |
