Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

[dcpomatic.git] / src / lib / dcp_decoder.h

diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h
index d81b20b5c30d2d4793870aa07e286155b55daf77..89931aa38361695ccc1e7750b3d5956761dde341 100644 (file)
--- a/src/lib/dcp_decoder.h
+++ b/src/lib/dcp_decoder.h
@@ -31,7 +31,7 @@ class Log;
 class DCPDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder
 {
 public:
-       DCPDecoder (boost::shared_ptr<const DCPContent>, boost::shared_ptr<Log>);
+       DCPDecoder (boost::shared_ptr<const DCPContent>);
 
 private:
        void seek (ContentTime t, bool accurate);
@@ -41,6 +41,5 @@ private:
        ContentTime _next;
        std::list<boost::shared_ptr<dcp::Reel> > _reels;
        std::list<boost::shared_ptr<dcp::Reel> >::iterator _reel;
-       boost::shared_ptr<Log> _log;
        boost::shared_ptr<const DCPContent> _dcp_content;
 };