Send previous playback informations that are reset with a stop

SRGSSR · Aug 17, 2017 · 54d5c39 · 54d5c39
1 parent c4f934b
commit 54d5c39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Framework/Sources/Player/SRGMediaPlayerController.m b/Framework/Sources/Player/SRGMediaPlayerController.m
@@ -614,9 +614,6 @@ - (void)reset
     if (self.contentURL) {
         userInfo[SRGMediaPlayerPreviousContentURLKey] = self.contentURL;
     }
-    userInfo[SRGMediaPlayerPreviousTimeRangeKey] = [NSValue valueWithCMTimeRange:self.timeRange];
-    userInfo[SRGMediaPlayerPreviousMediaTypeKey] = @(self.mediaType);
-    userInfo[SRGMediaPlayerPreviousStreamTypeKey] = @(self.streamType);
     if (self.userInfo) {
         userInfo[SRGMediaPlayerPreviousUserInfoKey] = self.userInfo;
     }
@@ -825,6 +822,9 @@ - (void)stopWithUserInfo:(NSDictionary *)userInfo
     // Only reset if needed (this would otherwise lazily instantiate the view again and create potential issues)
     if (self.player) {
         fullUserInfo[SRGMediaPlayerLastPlaybackTimeKey] = [NSValue valueWithCMTime:self.player.currentTime];
+        fullUserInfo[SRGMediaPlayerPreviousTimeRangeKey] = [NSValue valueWithCMTimeRange:self.timeRange];
+        fullUserInfo[SRGMediaPlayerPreviousMediaTypeKey] = @(self.mediaType);
+        fullUserInfo[SRGMediaPlayerPreviousStreamTypeKey] = @(self.streamType);
         self.player = nil;
     }
 

diff --git a/Tests/Sources/PlaybackTestCase.m b/Tests/Sources/PlaybackTestCase.m
@@ -1110,11 +1110,13 @@ - (void)testStop
 
         // No previous playback information since it has not changed
         XCTAssertNil(notification.userInfo[SRGMediaPlayerPreviousContentURLKey]);
-        XCTAssertNil(notification.userInfo[SRGMediaPlayerPreviousMediaTypeKey]);
-        XCTAssertNil(notification.userInfo[SRGMediaPlayerPreviousTimeRangeKey]);
-        XCTAssertNil(notification.userInfo[SRGMediaPlayerPreviousStreamTypeKey]);
         XCTAssertNil(notification.userInfo[SRGMediaPlayerPreviousUserInfoKey]);
 
+        // Previous playback information since it has changed
+        XCTAssertNotNil(notification.userInfo[SRGMediaPlayerPreviousMediaTypeKey]);
+        XCTAssertNotNil(notification.userInfo[SRGMediaPlayerPreviousTimeRangeKey]);
+        XCTAssertNotNil(notification.userInfo[SRGMediaPlayerPreviousStreamTypeKey]);
+
         TestAssertEqualTimeInSeconds([notification.userInfo[SRGMediaPlayerLastPlaybackTimeKey] CMTimeValue], 0);
 
         return YES;