projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More cycle-breaking of shared_ptr for decoder / player.
[dcpomatic.git]
/
src
/
lib
/
imagemagick_decoder.h
diff --git
a/src/lib/imagemagick_decoder.h
b/src/lib/imagemagick_decoder.h
index 7ad08df03a2e82f131ebbede586e890e00c34ba6..e7c9dee9a3ac35373668433e6208d02128aafc0a 100644
(file)
--- a/
src/lib/imagemagick_decoder.h
+++ b/
src/lib/imagemagick_decoder.h
@@
-30,32
+30,14
@@
class ImageMagickDecoder : public VideoDecoder
public:
ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
public:
ImageMagickDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageMagickContent>);
- float frames_per_second () const {
- /* We don't know */
- return 0;
+ float video_frame_rate () const {
+ return 24;
}
libdcp::Size native_size () const;
}
libdcp::Size native_size () const;
-
- ContentVideoFrame video_length () const {
- /* We don't know */
- return 0;
- }
-
- int audio_channels () const {
- return 0;
- }
-
- int audio_sample_rate () const {
- return 0;
- }
-
- int64_t audio_channel_layout () const {
- return 0;
- }
+ ContentVideoFrame video_length () const;
bool seek (double);
bool seek (double);
- bool seek_to_last ();
bool pass ();
protected:
bool pass ();
protected:
@@
-80,8
+62,7
@@
protected:
}
private:
}
private:
- void film_changed (Film::Property);
-
boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
boost::shared_ptr<const ImageMagickContent> _imagemagick_content;
+ boost::shared_ptr<Image> _image;
ContentVideoFrame _position;
};
ContentVideoFrame _position;
};