projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some vestigial stuff.
[dcpomatic.git]
/
src
/
lib
/
imagemagick_decoder.h
diff --git
a/src/lib/imagemagick_decoder.h
b/src/lib/imagemagick_decoder.h
index b7ab9af18119cf0c1677d3c6a0993f2b48335463..0e375f6e9e3127a040f862d014189e1d689527ca 100644
(file)
--- a/
src/lib/imagemagick_decoder.h
+++ b/
src/lib/imagemagick_decoder.h
@@
-17,33
+17,35
@@
*/
*/
-#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 {
float frames_per_second () const {
- return static_frames_per_second ();
+ /* We don't know */
+ return 0;
}
}
- Size native_size () const;
+
libdcp::
Size native_size () const;
- int audio_channels () const {
+ SourceFrame length () const {
+ /* We don't know */
return 0;
}
return 0;
}
- int audio_
sample_rate
() const {
+ int audio_
channels
() const {
return 0;
}
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 {
}
int64_t audio_channel_layout () const {
@@
-54,9
+56,8
@@
public:
return false;
}
return false;
}
- static float static_frames_per_second () {
- return 24;
- }
+ bool seek (double);
+ bool seek_to_last ();
protected:
bool pass ();
protected:
bool pass ();
@@
-81,6
+82,8
@@
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;
};
};