X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_decoder.h;h=ce9a3ef9af3dd7af03e311f2052f58a4abdf8b36;hb=6f344b876689a1234a5eb75041882f06f5d9fe5c;hp=0db707160b88e6a9a736136e5b4f983fd5086771;hpb=2e62b2c0de47fc8e5bcb5466b2876f9b23d2ae84;p=dcpomatic.git diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 0db707160..ce9a3ef9a 100644 --- a/src/lib/dcp_decoder.h +++ b/src/lib/dcp_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2016 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,7 +35,7 @@ struct dcp_subtitle_within_dcp_test; class DCPDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder { public: - DCPDecoder (boost::shared_ptr, bool fast); + DCPDecoder (boost::shared_ptr, boost::shared_ptr log, bool fast); std::list > reels () const { return _reels; @@ -50,6 +50,7 @@ private: std::list image_subtitles_during (ContentTimePeriod, bool starting) const; std::list text_subtitles_during (ContentTimePeriod, bool starting) const; + /** Time of next thing to return from pass relative to the start of _reel */ ContentTime _next; std::list > _reels; std::list >::iterator _reel;