From d2139a54878b677a3bda18e7d9f8304b4bdee21a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= Date: Mon, 13 Jan 2014 00:14:07 +0100 Subject: [PATCH] fix continue playback where left-off and show progress in library starting at 5% instead of 10% --- Sources/VLCMovieViewController.m | 4 ++-- Sources/VLCPlaylistCollectionViewCell.m | 2 +- Sources/VLCPlaylistTableViewCell.m | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sources/VLCMovieViewController.m b/Sources/VLCMovieViewController.m index c011220e..8697c401 100644 --- a/Sources/VLCMovieViewController.m +++ b/Sources/VLCMovieViewController.m @@ -517,7 +517,7 @@ if (duration != 0) playbackPositionInTime = @(lastPosition * (duration / 1000.)); } - if (playbackPositionInTime.intValue > 0 && (duration * lastPosition - duration) > 0) { + if (playbackPositionInTime.intValue > 0 && (duration * lastPosition - duration) < -60000) { /* start time is not supported for media lists */ [_mediaPlayer.media addOptions:@{@"start-time": playbackPositionInTime}]; APLog(@"set starttime to %i", playbackPositionInTime.intValue); @@ -545,7 +545,7 @@ _mediaPlayer.videoAspectRatio = NULL; /* some demuxers don't respect :start-time, so re-try here */ - if (lastPosition < .95 && _mediaPlayer.position < lastPosition && (duration * lastPosition - duration) > 0) + if (lastPosition < .95 && _mediaPlayer.position < lastPosition && (duration * lastPosition - duration) < -60000) _mediaPlayer.position = lastPosition; [self _resetIdleTimer]; diff --git a/Sources/VLCPlaylistCollectionViewCell.m b/Sources/VLCPlaylistCollectionViewCell.m index 7c285cea..7b033fde 100644 --- a/Sources/VLCPlaylistCollectionViewCell.m +++ b/Sources/VLCPlaylistCollectionViewCell.m @@ -231,7 +231,7 @@ if (SYSTEM_RUNS_IOS7_OR_LATER) { CGFloat duration = mediaItem.duration.floatValue; - if (position > .1f && position < .95f && (duration * position - duration) > 0) { + if (position > .05f && position < .95f && (duration * position - duration) < -60000) { [(UITextView*)self.mediaIsUnreadView setText:[NSString stringWithFormat:NSLocalizedString(@"LIBRARY_MINUTES_LEFT", @""), [[VLCTime timeWithInt:(duration * position - duration)] minuteStringValue]]]; self.mediaIsUnreadView.hidden = NO; } else if (mediaItem.unread.intValue) { diff --git a/Sources/VLCPlaylistTableViewCell.m b/Sources/VLCPlaylistTableViewCell.m index 06be4269..d102a2af 100644 --- a/Sources/VLCPlaylistTableViewCell.m +++ b/Sources/VLCPlaylistTableViewCell.m @@ -223,7 +223,7 @@ if (SYSTEM_RUNS_IOS7_OR_LATER) { CGFloat duration = mediaItem.duration.floatValue; - if (position > .1f && position < .95f && (duration * position - duration) > 0) { + if (position > .05f && position < .95f && (duration * position - duration) < -60000) { [(UITextView*)self.mediaIsUnreadView setText:[NSString stringWithFormat:NSLocalizedString(@"LIBRARY_MINUTES_LEFT", @""), [[VLCTime timeWithInt:(duration * position - duration)] minuteStringValue]]]; self.mediaIsUnreadView.hidden = NO; } else if (mediaItem.unread.intValue) { -- GitLab