From 6f344b876689a1234a5eb75041882f06f5d9fe5c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 12 Apr 2016 22:10:54 +0100 Subject: Reasonably straightforward stuff; main things are adding a _parent to VideoContent (mainly, but not only, for signalling) and moving the video shared_ptr into Content, which makes much more sense to replace dynamic_cast tests for whether something has video or whatever. Nearly builds. --- src/lib/dcp_decoder.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/dcp_decoder.h') diff --git a/src/lib/dcp_decoder.h b/src/lib/dcp_decoder.h index 32d334ec1..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; -- cgit v1.2.3