X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fimage_decoder.h;h=9b8cf73bbba6461a5da786d312338b35c25144de;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hp=9d81cdac18248087a9a4982c0c97fa59eedd3632;hpb=6f344b876689a1234a5eb75041882f06f5d9fe5c;p=dcpomatic.git diff --git a/src/lib/image_decoder.h b/src/lib/image_decoder.h index 9d81cdac1..9b8cf73bb 100644 --- a/src/lib/image_decoder.h +++ b/src/lib/image_decoder.h @@ -1,27 +1,30 @@ /* Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#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, boost::shared_ptr log); @@ -31,7 +34,7 @@ public: } private: - bool pass (PassReason, bool); + bool pass (Decoder::PassReason, bool); void seek (ContentTime, bool); boost::shared_ptr _image_content;