Skip to content

Commit 354b2c5

Browse files
committed
Merge branch 'release/7.2.3'
2 parents cbf8cf3 + 3041e15 commit 354b2c5

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

Demo/Demo.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Version information
2-
MARKETING_VERSION = 7.2.2
2+
MARKETING_VERSION = 7.2.3
33

44
// Deployment targets
55
IPHONEOS_DEPLOYMENT_TARGET = 12.0

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import PackageDescription
44

55
struct ProjectSettings {
6-
static let marketingVersion: String = "7.2.2"
6+
static let marketingVersion: String = "7.2.3"
77
}
88

99
let package = Package(

Sources/SRGMediaPlayer/SRGMediaPlayerController.m

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,12 @@ - (void)setPlayer:(SRGPlayer *)player
234234
};
235235

236236
SRGTimePosition *startTimePosition = [self timePositionForPosition:self.startPosition inSegment:self.targetSegment applyEndTolerance:YES];
237-
[player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:^(BOOL finished) {
238-
completionBlock(finished);
239-
}];
237+
if (CMTIME_COMPARE_INLINE(startTimePosition.time, !=, kCMTimeZero) || self.streamType == SRGMediaPlayerStreamTypeOnDemand) {
238+
[player seekToTime:startTimePosition.time toleranceBefore:startTimePosition.toleranceBefore toleranceAfter:startTimePosition.toleranceAfter notify:NO completionHandler:completionBlock];
239+
}
240+
else {
241+
completionBlock(YES);
242+
}
240243
}
241244
}
242245
else if (playerItem.status == AVPlayerItemStatusFailed) {

0 commit comments

Comments
 (0)