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

Fix iOS bug playing before load.

This commit is contained in:
Ryan Heise 2020-12-22 13:56:34 +11:00
parent 3e8ea3692c
commit c19ac28584
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -568,6 +568,9 @@
} else { } else {
// We send result after the playerItem is ready in observeValueForKeyPath. // We send result after the playerItem is ready in observeValueForKeyPath.
} }
if (_playing) {
_player.rate = _speed;
}
[self broadcastPlaybackEvent]; [self broadcastPlaybackEvent];
} }

21
just_audio/lib/just_audio.dart
View File

@ -86,6 +86,7 @@ class AudioPlayer {
bool _automaticallyWaitsToMinimizeStalling = true; bool _automaticallyWaitsToMinimizeStalling = true;
bool _playInterrupted = false; bool _playInterrupted = false;
AndroidAudioAttributes _androidAudioAttributes; AndroidAudioAttributes _androidAudioAttributes;
Completer<void> _playCompleter;
/// Creates an [AudioPlayer]. The player will automatically pause/duck and /// Creates an [AudioPlayer]. The player will automatically pause/duck and
/// resume/unduck when audio interruptions occur (e.g. a phone call) or when /// resume/unduck when audio interruptions occur (e.g. a phone call) or when
@ -678,19 +679,33 @@ class AudioPlayer {
Future<void> play() async { Future<void> play() async {
if (_disposed) return; if (_disposed) return;
if (playing) return; if (playing) return;
_setPlatformActive(_audioSource != null);
_playInterrupted = false; _playInterrupted = false;
// Broadcast to clients immediately, but revert to false if we fail to // Broadcast to clients immediately, but revert to false if we fail to
// activate the audio session. This allows setAudioSource to be aware of a // activate the audio session. This allows setAudioSource to be aware of a
// prior play request. // prior play request.
_playingSubject.add(true); _playingSubject.add(true);
_playCompleter = Completer();
final audioSession = await AudioSession.instance; final audioSession = await AudioSession.instance;
if (await audioSession.setActive(true)) { if (await audioSession.setActive(true)) {
await (await _platform).play(PlayRequest()); final shouldActivate = _audioSource != null;
if (shouldActivate) {
if (_active) {
// If the native platform is already active, send it a play request.
await (await _platform).play(PlayRequest());
_playCompleter.complete();
} else {
// If the native platform wasn't already active, activating it will
// implicitly restore the playing state and send a play request.
_setPlatformActive(true);
}
}
} else { } else {
// Revert if we fail to activate the audio session. // Revert if we fail to activate the audio session.
_playingSubject.add(false); _playingSubject.add(false);
_playCompleter.complete();
} }
await _playCompleter.future;
_playCompleter = null;
} }
/// Pauses the currently playing media. This method does nothing if /// Pauses the currently playing media. This method does nothing if
@ -966,7 +981,7 @@ class AudioPlayer {
? ShuffleModeMessage.all ? ShuffleModeMessage.all
: ShuffleModeMessage.none)); : ShuffleModeMessage.none));
if (playing) { if (playing) {
platform.play(PlayRequest()); platform.play(PlayRequest()).then((_) => _playCompleter?.complete());
} }
} }
if (audioSource != null) { if (audioSource != null) {