projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Runs.
[dcpomatic.git]
/
src
/
lib
/
imagemagick_decoder.h
diff --git
a/src/lib/imagemagick_decoder.h
b/src/lib/imagemagick_decoder.h
index c4795b003732dd3c500d5e326df6de7fbecca131..b04bd88b10bba16d893769e0991656331b1c5da8 100644
(file)
--- a/
src/lib/imagemagick_decoder.h
+++ b/
src/lib/imagemagick_decoder.h
@@
-23,10
+23,12
@@
namespace Magick {
class Image;
}
class Image;
}
+class ImageMagickContent;
+
class ImageMagickDecoder : public VideoDecoder
{
public:
class ImageMagickDecoder : public VideoDecoder
{
public:
- ImageMagickDecoder (boost::shared_ptr<
Film>, boost::shared_ptr<const DecodeOptions>, Job *
);
+ ImageMagickDecoder (boost::shared_ptr<
const Film>, boost::shared_ptr<ImageMagickContent>, DecodeOptions
);
float frames_per_second () const {
/* We don't know */
float frames_per_second () const {
/* We don't know */
@@
-35,7
+37,7
@@
public:
libdcp::Size native_size () const;
libdcp::Size native_size () const;
-
SourceFrame
length () const {
+
ContentVideoFrame video_
length () const {
/* We don't know */
return 0;
}
/* We don't know */
return 0;
}
@@
-52,15
+54,11
@@
public:
return 0;
}
return 0;
}
- bool has_subtitles () const {
- return false;
- }
-
bool seek (double);
bool seek_to_last ();
bool seek (double);
bool seek_to_last ();
+ bool pass ();
protected:
protected:
- bool pass ();
PixelFormat pixel_format () const;
int time_base_numerator () const {
PixelFormat pixel_format () const;
int time_base_numerator () const {
@@
-83,7
+81,7
@@
protected:
private:
void film_changed (Film::Property);
private:
void film_changed (Film::Property);
-
-
std::list<std::string> _files
;
-
std::list<std::string>::iterator _iter
;
+
+
boost::shared_ptr<ImageMagickContent> _imagemagick_content
;
+
ContentVideoFrame _position
;
};
};