Remove unused Processor::process_begin; some docs.

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

diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 809f3aecdb61ce6d6cb24fd7f933ebbf4abbd7a2..f636191f2e3bdbb6da13d799c13a496cabbd6885 100644 (file)
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -17,23 +17,20 @@
 
 */
 
-#include "decoder.h"
+#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;
@@ -46,10 +43,6 @@ public:
                return 0;
        }
 
-       AVSampleFormat audio_sample_format () const {
-               return AV_SAMPLE_FMT_NONE;
-       }
-
        int64_t audio_channel_layout () const {
                return 0;
        }
@@ -58,12 +51,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 {
@@ -85,6 +74,6 @@ protected:
        }
 
 private:
-       Magick::Image* _magick_image;
-       bool _done;
+       std::list<std::string> _files;
+       std::list<std::string>::iterator _iter;
 };