From 0330d9b2924767d9240c5a25e9ed4327eb0a73bd Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 18 Dec 2012 21:13:10 +0000
Subject: Try to tidy up subtitle timing and seeks wrt source frames, DCP
 frames and rounding.

---
 src/lib/imagemagick_decoder.cc | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/lib/imagemagick_decoder.cc')

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 5713e68f9..131eaa500 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -108,8 +108,22 @@ ImageMagickDecoder::pixel_format () const
 }
 
 bool
-ImageMagickDecoder::seek (SourceFrame f)
+ImageMagickDecoder::seek_to_last ()
 {
+	if (_iter == _files.end()) {
+		_iter = _files.begin();
+	} else {
+		--_iter;
+	}
+
+	return false;
+}
+
+bool
+ImageMagickDecoder::seek (double t)
+{
+	int const f = t * frames_per_second();
+	
 	_iter = _files.begin ();
 	for (int i = 0; i < f; ++i) {
 		if (_iter == _files.end()) {
-- 
cgit v1.2.3