Improve skip button behavior

SRGSSR · Nov 29, 2018 · d749b2d · d749b2d
1 parent 8e3258b
commit d749b2d
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/Framework/Sources/Controllers/SRGMediaPlayerViewController.m b/Framework/Sources/Controllers/SRGMediaPlayerViewController.m
@@ -361,7 +361,14 @@ - (BOOL)canSkipBackwardFromTime:(CMTime)time
         return NO;
     }
 
-    SRGMediaPlayerStreamType streamType = self.controller.streamType;
+    SRGMediaPlayerController *controller = self.controller;
+    SRGMediaPlayerPlaybackState playbackState = controller.playbackState;
+
+    if (playbackState == SRGMediaPlayerPlaybackStateIdle || playbackState == SRGMediaPlayerPlaybackStatePreparing) {
+        return NO;
+    }
+
+    SRGMediaPlayerStreamType streamType = controller.streamType;
     return (streamType == SRGMediaPlayerStreamTypeOnDemand || streamType == SRGMediaPlayerStreamTypeDVR);
 }
 
@@ -372,8 +379,15 @@ - (BOOL)canSkipForwardFromTime:(CMTime)time
     }
 
     SRGMediaPlayerController *controller = self.controller;
-    return (controller.streamType == SRGMediaPlayerStreamTypeOnDemand && CMTimeGetSeconds(time) + SRGMediaPlayerViewControllerForwardSkipInterval < CMTimeGetSeconds(controller.player.currentItem.duration))
-        || (controller.streamType == SRGMediaPlayerStreamTypeDVR && ! controller.live);
+    SRGMediaPlayerPlaybackState playbackState = controller.playbackState;
+
+    if (playbackState == SRGMediaPlayerPlaybackStateIdle || playbackState == SRGMediaPlayerPlaybackStatePreparing) {
+        return NO;
+    }
+
+    SRGMediaPlayerStreamType streamType = controller.streamType;
+    return (streamType == SRGMediaPlayerStreamTypeOnDemand && CMTimeGetSeconds(time) + SRGMediaPlayerViewControllerForwardSkipInterval < CMTimeGetSeconds(controller.player.currentItem.duration))
+        || (streamType == SRGMediaPlayerStreamTypeDVR && ! controller.live);
 }
 
 - (void)skipBackwardFromTime:(CMTime)time withCompletionHandler:(void (^)(BOOL finished))completionHandler