X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.h;h=862baffee9aa9cfa381449680d51b972e9091dcf;hb=504c63b3d62038bc486ca8a09e77fbb403907edd;hp=4ce75a20d043871add2623699877029e45d4f8fe;hpb=bd709c1e98e7653dafe7dff302440a7890140c7d;p=dcpomatic.git diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h index 4ce75a20d..862baffee 100644 --- a/src/lib/image_decoder.h +++ b/src/lib/image_decoder.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Carl Hetherington + Copyright (C) 2012-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 @@ -17,25 +17,26 @@ */ -#include "video_decoder.h" +#include "decoder.h" class ImageContent; +class Log; +class ImageProxy; -class ImageDecoder : public VideoDecoder +class ImageDecoder : public Decoder { public: - ImageDecoder (boost::shared_ptr c); + ImageDecoder (boost::shared_ptr c, boost::shared_ptr log); boost::shared_ptr content () { return _image_content; } private: - bool pass (PassReason); + bool pass (Decoder::PassReason, bool); void seek (ContentTime, bool); boost::shared_ptr _image_content; boost::shared_ptr _image; Frame _video_position; }; -