From 87da92b45a9a0cf4ce809ea580a78c4dd5d96021 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Nov 2014 22:33:37 +0000 Subject: Remove log from ImageProxy hierarchy. --- src/lib/dcp_decoder.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/lib/dcp_decoder.cc') diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index bf016ef87..adeadd98a 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -38,11 +38,10 @@ using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; -DCPDecoder::DCPDecoder (shared_ptr c, shared_ptr log) +DCPDecoder::DCPDecoder (shared_ptr c) : VideoDecoder (c) , AudioDecoder (c) , SubtitleDecoder (c) - , _log (log) , _dcp_content (c) { dcp::DCP dcp (c->directory ()); @@ -71,15 +70,15 @@ DCPDecoder::pass () shared_ptr stereo = dynamic_pointer_cast (mxf); int64_t const entry_point = (*_reel)->main_picture()->entry_point (); if (mono) { - video (shared_ptr (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size(), _log)), frame); + video (shared_ptr (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size())), frame); } else { video ( - shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT, _log)), + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT)), frame ); video ( - shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT, _log)), + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT)), frame ); } -- cgit v1.2.3