Merge branch 'master' into speed-up

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 05dc7f113386caef7384493e0ff9bdf8e9114fe8..de49c1b566b6ef0a36ae2bb44c0e05d77a65da6c 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -1,34 +1,51 @@
-#include "decoder.h"
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    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
+    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,
+    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.
+
+*/
+
+#include "video_decoder.h"
 
 namespace Magick {
        class Image;
 }
 
-class ImageMagickDecoder : public Decoder
+class ImageMagickDecoder : public VideoDecoder
 {
 public:
-       ImageMagickDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
-
-       int length_in_frames () const {
-               return 1;
-       }
+       ImageMagickDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
 
        float frames_per_second () const {
-               return static_frames_per_second ();
+               /* We don't know */
+               return 0;
        }
 
        Size native_size () const;
 
-       int audio_channels () const {
+       SourceFrame length () const {
+               /* We don't know */
                return 0;
        }
 
-       int audio_sample_rate () const {
+       int audio_channels () const {
                return 0;
        }
 
-       AVSampleFormat audio_sample_format () const {
-               return AV_SAMPLE_FMT_NONE;
+       int audio_sample_rate () const {
+               return 0;
        }
 
        int64_t audio_channel_layout () const {
@@ -39,12 +56,8 @@ public:
                return false;
        }
 
-       static float static_frames_per_second () {
-               return 24;
-       }
-
 protected:
-       bool do_pass ();
+       bool pass ();
        PixelFormat pixel_format () const;
 
        int time_base_numerator () const {
@@ -66,6 +79,6 @@ protected:
        }
 
 private:
-       Magick::Image* _magick_image;
-       bool _done;
+       std::list<std::string> _files;
+       std::list<std::string>::iterator _iter;
 };