summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index d1f047851..ac046fcc0 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -277,7 +277,14 @@ Player::last_video_time () const
case Playlist::VIDEO_FFMPEG:
return _ffmpeg_decoder->last_source_time ();
case Playlist::VIDEO_IMAGEMAGICK:
- return (*_imagemagick_decoder)->last_source_time ();
+ {
+ double t = 0;
+ for (list<shared_ptr<ImageMagickDecoder> >::const_iterator i = _imagemagick_decoders.begin(); i != _imagemagick_decoder; ++i) {
+ t += (*i)->video_length() / (*i)->video_frame_rate ();
+ }
+
+ return t + (*_imagemagick_decoder)->last_source_time ();
+ }
}
return 0;