exttex
/
just_audio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support initialPosition/initialIndex load params on iOS.

This commit is contained in:
Ryan Heise 2020-10-17 00:06:19 +11:00
parent 082666d9d1
commit 244d6d54f9
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
just_audio/darwin/Classes/AudioPlayer.m
View File

@ -33,6 +33,7 @@
// Set when the current item hasn't been played yet so we aren't sure whether sufficient audio has been buffered. // Set when the current item hasn't been played yet so we aren't sure whether sufficient audio has been buffered.
BOOL _bufferUnconfirmed; BOOL _bufferUnconfirmed;
CMTime _seekPos; CMTime _seekPos;
CMTime _initialPos;
FlutterResult _loadResult; FlutterResult _loadResult;
FlutterResult _playResult; FlutterResult _playResult;
id _timeObserver; id _timeObserver;
@ -63,6 +64,7 @@
_order = nil; _order = nil;
_orderInv = nil; _orderInv = nil;
_seekPos = kCMTimeInvalid; _seekPos = kCMTimeInvalid;
_initialPos = kCMTimeZero;
_timeObserver = 0; _timeObserver = 0;
_updatePosition = 0; _updatePosition = 0;
_updateTime = 0; _updateTime = 0;
@ -85,7 +87,8 @@
@try { @try {
NSDictionary *request = (NSDictionary *)call.arguments; NSDictionary *request = (NSDictionary *)call.arguments;
if ([@"load" isEqualToString:call.method]) { if ([@"load" isEqualToString:call.method]) {
[self load:request[@"audioSource"] result:result]; CMTime initialPosition = request[@"initialPosition"] == [NSNull null] ? kCMTimeZero : CMTimeMake([request[@"initialPosition"] longLongValue], 1000000);
[self load:request[@"audioSource"] initialPosition:initialPosition initialIndex:request[@"initialIndex"] result:result];
} else if ([@"play" isEqualToString:call.method]) { } else if ([@"play" isEqualToString:call.method]) {
[self play:result]; [self play:result];
} else if ([@"pause" isEqualToString:call.method]) { } else if ([@"pause" isEqualToString:call.method]) {
@ -316,7 +319,7 @@
- (int)getCurrentPosition { - (int)getCurrentPosition {
if (_processingState == none || _processingState == loading) { if (_processingState == none || _processingState == loading) {
return 0; return (int)(1000 * CMTimeGetSeconds(_initialPos));
} else if (CMTIME_IS_VALID(_seekPos)) { } else if (CMTIME_IS_VALID(_seekPos)) {
return (int)(1000 * CMTimeGetSeconds(_seekPos)); return (int)(1000 * CMTimeGetSeconds(_seekPos));
} else if (_indexedAudioSources && _indexedAudioSources.count > 0) { } else if (_indexedAudioSources && _indexedAudioSources.count > 0) {
@ -485,17 +488,18 @@
_updateTime = (long long)([[NSDate date] timeIntervalSince1970] * 1000.0); _updateTime = (long long)([[NSDate date] timeIntervalSince1970] * 1000.0);
} }
- (void)load:(NSDictionary *)source result:(FlutterResult)result { - (void)load:(NSDictionary *)source initialPosition:(CMTime)initialPosition initialIndex:(NSNumber *)initialIndex result:(FlutterResult)result {
if (_playing) { if (_playing) {
[_player pause]; [_player pause];
} }
if (_processingState == loading) { if (_processingState == loading) {
[self abortExistingConnection]; [self abortExistingConnection];
} }
_initialPos = initialPosition;
_loadResult = result; _loadResult = result;
_index = 0; _index = (initialIndex != [NSNull null]) ? [initialIndex intValue] : 0;
[self updatePosition];
_processingState = loading; _processingState = loading;
[self updatePosition];
[self broadcastPlaybackEvent]; [self broadcastPlaybackEvent];
// Remove previous observers // Remove previous observers
if (_indexedAudioSources) { if (_indexedAudioSources) {
@ -562,7 +566,7 @@
} }
} }
// Initialise the AVQueuePlayer with items. // Initialise the AVQueuePlayer with items.
[self enqueueFrom:0]; [self enqueueFrom:_index];
// Notify each IndexedAudioSource that it's been attached to the player. // Notify each IndexedAudioSource that it's been attached to the player.
for (int i = 0; i < [_indexedAudioSources count]; i++) { for (int i = 0; i < [_indexedAudioSources count]; i++) {
[_indexedAudioSources[i] attach:_player]; [_indexedAudioSources[i] attach:_player];
@ -714,6 +718,13 @@
_loadResult(@{@"duration": @((long long)1000 * [self getDuration])}); _loadResult(@{@"duration": @((long long)1000 * [self getDuration])});
_loadResult = nil; _loadResult = nil;
} }
if (CMTIME_IS_VALID(_initialPos) && CMTIME_COMPARE_INLINE(_initialPos, >, kCMTimeZero)) {
[playerItem.audioSource seek:_initialPos completionHandler:^(BOOL finished) {
[self updatePosition];
[self broadcastPlaybackEvent];
}];
_initialPos = kCMTimeZero;
}
break; break;
} }
case AVPlayerItemStatusFailed: { case AVPlayerItemStatusFailed: {
@ -895,7 +906,12 @@
} }
- (void)play:(FlutterResult)result { - (void)play:(FlutterResult)result {
if (_playing) return; if (_playing) {
if (result) {
result(@{});
}
return;
}
if (result) { if (result) {
if (_playResult) { if (_playResult) {
NSLog(@"INTERRUPTING PLAY"); NSLog(@"INTERRUPTING PLAY");
@ -1004,6 +1020,9 @@
- (void)seek:(CMTime)position index:(NSNumber *)newIndex completionHandler:(void (^)(BOOL))completionHandler { - (void)seek:(CMTime)position index:(NSNumber *)newIndex completionHandler:(void (^)(BOOL))completionHandler {
if (_processingState == none || _processingState == loading) { if (_processingState == none || _processingState == loading) {
if (completionHandler) {
completionHandler(NO);
}
return; return;
} }
int index = _index; int index = _index;