diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-11-21 02:45:30 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-11-21 02:45:30 +0000 |
| commit | 84012cdd64f451891febd36154b7226ea21a899b (patch) | |
| tree | 096fb898aa14d936dfc8f8598a6908337508233c /src/lib/dcp_decoder.h | |
| parent | 254b3044d72de6b033d7c584f5abd2b9aa70aad5 (diff) | |
Put Film pointer into Decoder.
Diffstat (limited to 'src/lib/dcp_decoder.h')
| -rw-r--r-- | src/lib/dcp_decoder.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index d3c5c57ed..4068696ea 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -40,7 +40,7 @@ struct dcp_subtitle_within_dcp_test; class DCPDecoder : public DCP, public Decoder { public: - DCPDecoder (boost::shared_ptr<const DCPContent>, bool fast); + DCPDecoder (boost::shared_ptr<const Film> film, boost::shared_ptr<const DCPContent>, bool fast); std::list<boost::shared_ptr<dcp::Reel> > reels () const { return _reels; @@ -49,17 +49,16 @@ public: void set_decode_referenced (bool r); void set_forced_reduction (boost::optional<int> reduction); - bool pass (boost::shared_ptr<const Film> film); - void seek (boost::shared_ptr<const Film> film, ContentTime t, bool accurate); + bool pass (); + void seek (ContentTime t, bool accurate); private: friend struct dcp_subtitle_within_dcp_test; void next_reel (); void get_readers (); - void pass_texts (boost::shared_ptr<const Film> film, ContentTime next, dcp::Size size); + void pass_texts (ContentTime next, dcp::Size size); void pass_texts ( - boost::shared_ptr<const Film> film, ContentTime next, boost::shared_ptr<dcp::SubtitleAsset> asset, bool reference, |