Fix segments incorrectly displayed in the info panel for livestreams …

…without DVR This fixes issue #236.
SRGSSR · Nov 23, 2020 · 2d14dc8 · 2d14dc8
1 parent b41fe07
commit 2d14dc8
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/Sources/SRGLetterbox/SRGLetterboxViewController~tvos.m b/Sources/SRGLetterbox/SRGLetterboxViewController~tvos.m
@@ -655,6 +655,12 @@ - (void)continuousPlaybackViewController:(SRGContinuousPlaybackViewController *)
     NSMutableArray<AVTimedMetadataGroup *> *navigationMarkers = [NSMutableArray array];
 
     for (SRGSegment *segment in segments) {
+        SRGMediaPlayerController *mediaPlayerController = playerViewController.controller;
+        CMTimeRange segmentTimeRange = [segment.srg_markRange timeRangeForMediaPlayerController:mediaPlayerController];
+        if (! CMTimeRangeContainsTime(mediaPlayerController.timeRange, segmentTimeRange.start)) {
+            continue;
+        }
+
         AVMutableMetadataItem *titleItem = [[AVMutableMetadataItem alloc] init];
         titleItem.identifier = AVMetadataCommonIdentifierTitle;
         titleItem.value = segment.title;
@@ -671,7 +677,6 @@ - (void)continuousPlaybackViewController:(SRGContinuousPlaybackViewController *)
         artworkItem.value = UIImagePNGRepresentation(image);
         artworkItem.extendedLanguageTag = @"und";       // Apparently not required, but added for safety / consistency
 
-        CMTimeRange segmentTimeRange = [segment.srg_markRange timeRangeForMediaPlayerController:self.playerViewController.controller];
         AVTimedMetadataGroup *navigationMarker = [[AVTimedMetadataGroup alloc] initWithItems:@[ titleItem.copy, artworkItem.copy ] timeRange:segmentTimeRange];
         [navigationMarkers addObject:navigationMarker];
     }