From e718d7e707469b56d01623e1cbbb75f2d648c1eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20De=CC=81fago?= Date: Fri, 26 Jul 2024 11:34:25 +0200 Subject: [PATCH 1/2] Bump version number --- Demo/Demo.xcconfig | 2 +- Package.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Demo/Demo.xcconfig b/Demo/Demo.xcconfig index ae90055e..aa28c2f2 100644 --- a/Demo/Demo.xcconfig +++ b/Demo/Demo.xcconfig @@ -1,5 +1,5 @@ // Version information -MARKETING_VERSION = 7.2.2 +MARKETING_VERSION = 7.2.3 // Deployment targets IPHONEOS_DEPLOYMENT_TARGET = 12.0 diff --git a/Package.swift b/Package.swift index 177b6ecf..75986c5a 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "7.2.2" + static let marketingVersion: String = "7.2.3" } let package = Package( From 3041e15f4dfd7c7f9ce92d5c712a3a1b8dcc3050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20D=C3=A9fago?= Date: Sun, 4 Aug 2024 08:38:51 +0200 Subject: [PATCH 2/2] Fix incorrect DVR stream at position zero (#136) --- Sources/SRGMediaPlayer/SRGMediaPlayerController.m | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Sources/SRGMediaPlayer/SRGMediaPlayerController.m b/Sources/SRGMediaPlayer/SRGMediaPlayerController.m index 5389a1eb..f6d8e841 100644 --- a/Sources/SRGMediaPlayer/SRGMediaPlayerController.m +++ b/Sources/SRGMediaPlayer/SRGMediaPlayerController.m @@ -234,9 +234,12 @@ - (void)setPlayer:(SRGPlayer *)player }; SRGTimePosition *startTimePosition = [self timePositionForPosition:self.startPosition inSegment:self.targetSegment applyEndTolerance:YES]; - [player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:^(BOOL finished) { - completionBlock(finished); - }]; + if (CMTIME_COMPARE_INLINE(startTimePosition.time, !=, kCMTimeZero) || self.streamType == SRGMediaPlayerStreamTypeOnDemand) { + [player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:completionBlock]; + } + else { + completionBlock(YES); + } } } else if (playerItem.status == AVPlayerItemStatusFailed) {