diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme index 499cdd45..e1fad6ad 100644 --- a/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme +++ b/.swiftpm/xcode/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme @@ -1,6 +1,6 @@ = 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.2.5) + rexml (3.2.8) + strscan (>= 3.0.9) rouge (2.0.7) ruby2_keywords (0.0.5) rubyzip (2.3.2) @@ -181,6 +182,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + strscan (3.1.0) terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) diff --git a/Package.swift b/Package.swift index 5d31439a..177b6ecf 100644 --- a/Package.swift +++ b/Package.swift @@ -3,7 +3,7 @@ import PackageDescription struct ProjectSettings { - static let marketingVersion: String = "7.2.1" + static let marketingVersion: String = "7.2.2" } let package = Package( diff --git a/Sources/SRGMediaPlayer/SRGMediaPlayerController.m b/Sources/SRGMediaPlayer/SRGMediaPlayerController.m index 0d144448..5389a1eb 100644 --- a/Sources/SRGMediaPlayer/SRGMediaPlayerController.m +++ b/Sources/SRGMediaPlayer/SRGMediaPlayerController.m @@ -234,20 +234,9 @@ - (void)setPlayer:(SRGPlayer *)player }; SRGTimePosition *startTimePosition = [self timePositionForPosition:self.startPosition inSegment:self.targetSegment applyEndTolerance:YES]; - if (CMTIME_COMPARE_INLINE(startTimePosition.time, ==, kCMTimeZero)) { - // Default position. Nothing to do. - completionBlock(YES); - } - else { - if (CMTIME_COMPARE_INLINE(startTimePosition.time, !=, kCMTimeZero)) { - [player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:^(BOOL finished) { - completionBlock(finished); - }]; - } - else { - completionBlock(YES); - } - } + [player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:^(BOOL finished) { + completionBlock(finished); + }]; } } else if (playerItem.status == AVPlayerItemStatusFailed) { diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 5c9ea31e..5f104e37 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -26,7 +26,7 @@ platform :ios do clean_result_files clean_derived_data - iphone14 = Device.new('iOS', 'iPhone 14') + iphone14 = Device.new('iOS', 'iPhone 15') appletv = Device.new('tvOS', 'Apple TV') devices = [iphone14, appletv]