projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'staging' of ssh://houllier/home/carl/git/dvdomatic into staging
[dcpomatic.git]
/
src
/
lib
/
imagemagick_decoder.h
diff --git
a/src/lib/imagemagick_decoder.h
b/src/lib/imagemagick_decoder.h
index 0e375f6e9e3127a040f862d014189e1d689527ca..80a08f81f8374a3126a425ee413d0c0eedf21e29 100644
(file)
--- a/
src/lib/imagemagick_decoder.h
+++ b/
src/lib/imagemagick_decoder.h
@@
-28,10
+28,7
@@
class ImageMagickDecoder : public VideoDecoder
public:
ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions);
public:
ImageMagickDecoder (boost::shared_ptr<Film>, DecodeOptions);
- float frames_per_second () const {
- /* We don't know */
- return 0;
- }
+ float frames_per_second () const;
libdcp::Size native_size () const;
libdcp::Size native_size () const;
@@
-52,10
+49,6
@@
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 ();
@@
-86,4
+79,6
@@
private:
std::list<std::string> _files;
std::list<std::string>::iterator _iter;
std::list<std::string> _files;
std::list<std::string>::iterator _iter;
+
+ boost::shared_ptr<Image> _image;
};
};