summaryrefslogtreecommitdiff
path: root/src/lib/imagemagick_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-06 00:46:10 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-06 00:46:10 +0000
commit59de84a29b81ac32477a4b804ca8bb9ec2760e67 (patch)
treeec0f37c766f2c65318c5b020818944614b101016 /src/lib/imagemagick_decoder.cc
parent18614dda0d53b713ace5ad1df57298d049dba87f (diff)
First cut.
Diffstat (limited to 'src/lib/imagemagick_decoder.cc')
-rw-r--r--src/lib/imagemagick_decoder.cc14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 38dace6de..119f05792 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -31,6 +31,8 @@ using std::cout;
using boost::shared_ptr;
using libdcp::Size;
+/* XXX: reads a directory and then ignores it */
+
ImageMagickDecoder::ImageMagickDecoder (
boost::shared_ptr<Film> f, DecodeOptions o)
: Decoder (f, o)
@@ -77,8 +79,8 @@ ImageMagickDecoder::pass ()
return true;
}
- /* XXX: timestamp is wrong */
- repeat_last_video (0);
+ /* XXX: timestamp */
+ emit_video (_image, 0);
return false;
}
@@ -101,9 +103,10 @@ ImageMagickDecoder::pass ()
delete magick_image;
- image = image->crop (_film->crop(), true);
-
- emit_video (image, 0);
+ _image = image->crop (_film->crop(), true);
+
+ /* XXX: timestamp */
+ emit_video (_image, 0);
++_iter;
return false;
@@ -131,6 +134,7 @@ ImageMagickDecoder::seek_to_last ()
bool
ImageMagickDecoder::seek (double t)
{
+ /* XXX: frames_per_second == 0 */
int const f = t * frames_per_second();
_iter = _files.begin ();