projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hacks.
[dcpomatic.git]
/
src
/
lib
/
imagemagick_decoder.cc
diff --git
a/src/lib/imagemagick_decoder.cc
b/src/lib/imagemagick_decoder.cc
index c9123c77c288404e31783f41d6c26e51895a2674..acc34421cc28c1df84c1249fa0332af55d962da9 100644
(file)
--- a/
src/lib/imagemagick_decoder.cc
+++ b/
src/lib/imagemagick_decoder.cc
@@
-34,7
+34,7
@@
using libdcp::Size;
ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
: Decoder (f)
ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
: Decoder (f)
- , VideoDecoder (f
, c
)
+ , VideoDecoder (f)
, ImageMagick (c)
{
, ImageMagick (c)
{
@@
-43,12
+43,12
@@
ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<con
void
ImageMagickDecoder::pass ()
{
void
ImageMagickDecoder::pass ()
{
- if (_next_video
>= _imagemagick_content->
length ()) {
+ if (_next_video
_frame >= _imagemagick_content->video_
length ()) {
return;
}
if (_image) {
return;
}
if (_image) {
- video (_image, true, _next_video);
+ video (_image, true, _next_video
_frame
);
return;
}
return;
}
@@
-71,48
+71,25
@@
ImageMagickDecoder::pass ()
delete magick_image;
delete magick_image;
- _image = _image->crop (_imagemagick_content->crop(), true);
- video (_image, false, _next_video);
+ video (_image, false, _next_video_frame);
}
void
}
void
-ImageMagickDecoder::seek (
Time t
)
+ImageMagickDecoder::seek (
VideoContent::Frame frame
)
{
{
- _next_video
= t
;
+ _next_video
_frame = frame
;
}
void
ImageMagickDecoder::seek_back ()
{
}
void
ImageMagickDecoder::seek_back ()
{
- boost::shared_ptr<const Film> f = _film.lock ();
- if (!f) {
- return;
- }
-
- _next_video -= f->video_frames_to_time (2);
-}
-
-void
-ImageMagickDecoder::seek_forward ()
-{
- boost::shared_ptr<const Film> f = _film.lock ();
- if (!f) {
- return;
+ if (_next_video_frame > 0) {
+ _next_video_frame--;
}
}
-
- _next_video += f->video_frames_to_time (1);
}
}
-Time
-ImageMagickDecoder::position () const
-{
- return _next_video;
-}
-
-
bool
ImageMagickDecoder::done () const
{
bool
ImageMagickDecoder::done () const
{
- return
video_done
();
+ return
_next_video_frame > _imagemagick_content->video_length
();
}
}
-