diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-08-23 00:27:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-08-24 10:01:52 +0100 |
| commit | df28b0e939bd0f12ae31e6f7ba94fa954496b3b8 (patch) | |
| tree | 9dcdf8708fe678fc1419e90dc6fdc3f8da8fafb2 /src/lib/dcp_decoder.h | |
| parent | 2f1d460898f40844d47d6a3b858449ac09d8b342 (diff) | |
Allow import of OV/VF DCPs (#906).
Diffstat (limited to 'src/lib/dcp_decoder.h')
| -rw-r--r-- | src/lib/dcp_decoder.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 12e37104e..6e1f95356 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -23,6 +23,7 @@ */ #include "decoder.h" +#include "dcp.h" namespace dcp { class Reel; @@ -35,7 +36,7 @@ class DCPContent; class Log; struct dcp_subtitle_within_dcp_test; -class DCPDecoder : public Decoder +class DCPDecoder : public DCP, public Decoder { public: DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log> log); @@ -57,7 +58,6 @@ private: std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const; std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const; - boost::shared_ptr<const DCPContent> _dcp_content; /** Time of next thing to return from pass relative to the start of _reel */ ContentTime _next; std::list<boost::shared_ptr<dcp::Reel> > _reels; |