projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Couple of missing formats from Image::components().
[dcpomatic.git]
/
src
/
lib
/
imagemagick_decoder.h
diff --git
a/src/lib/imagemagick_decoder.h
b/src/lib/imagemagick_decoder.h
index 1bf50378bc3788bbc723f9c2ad79750582cd272f..80a08f81f8374a3126a425ee413d0c0eedf21e29 100644
(file)
--- a/
src/lib/imagemagick_decoder.h
+++ b/
src/lib/imagemagick_decoder.h
@@
-17,22
+17,25
@@
*/
*/
-#include "decoder.h"
+#include "
video_
decoder.h"
namespace Magick {
class Image;
}
namespace Magick {
class Image;
}
-class ImageMagickDecoder : public Decoder
+class ImageMagickDecoder : public
Video
Decoder
{
public:
{
public:
- ImageMagickDecoder (boost::shared_ptr<Film>,
boost::shared_ptr<const Options>, Job *
);
+ ImageMagickDecoder (boost::shared_ptr<Film>,
DecodeOptions
);
- float frames_per_second () const
{
- return static_frames_per_second ();
- }
+ float frames_per_second () const
;
+
+ libdcp::Size native_size () const;
- Size native_size () const;
+ SourceFrame length () const {
+ /* We don't know */
+ return 0;
+ }
int audio_channels () const {
return 0;
int audio_channels () const {
return 0;
@@
-46,13
+49,8
@@
public:
return 0;
}
return 0;
}
- bool has_subtitles () const {
- return false;
- }
-
- static float static_frames_per_second () {
- return 24;
- }
+ bool seek (double);
+ bool seek_to_last ();
protected:
bool pass ();
protected:
bool pass ();
@@
-77,6
+75,10
@@
protected:
}
private:
}
private:
- Magick::Image* _magick_image;
- bool _done;
+ void film_changed (Film::Property);
+
+ std::list<std::string> _files;
+ std::list<std::string>::iterator _iter;
+
+ boost::shared_ptr<Image> _image;
};
};