Update state before method channel calls complete.
This commit is contained in:
parent
b10583e8d6
commit
5e9a707e08
|
@ -115,9 +115,9 @@ public class AudioPlayer implements MethodCallHandler, Player.EventListener {
|
||||||
if (prepareResult != null) {
|
if (prepareResult != null) {
|
||||||
duration = player.getDuration();
|
duration = player.getDuration();
|
||||||
justConnected = true;
|
justConnected = true;
|
||||||
|
transition(PlaybackState.stopped);
|
||||||
prepareResult.success(duration);
|
prepareResult.success(duration);
|
||||||
prepareResult = null;
|
prepareResult = null;
|
||||||
transition(PlaybackState.stopped);
|
|
||||||
}
|
}
|
||||||
if (seekProcessed) {
|
if (seekProcessed) {
|
||||||
completeSeek();
|
completeSeek();
|
||||||
|
|
|
@ -92,7 +92,7 @@ packages:
|
||||||
path: ".."
|
path: ".."
|
||||||
relative: true
|
relative: true
|
||||||
source: path
|
source: path
|
||||||
version: "0.1.4"
|
version: "0.1.5"
|
||||||
matcher:
|
matcher:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|
|
@ -233,6 +233,15 @@ class AudioPlayer {
|
||||||
/// * [AudioPlaybackState.connecting]
|
/// * [AudioPlaybackState.connecting]
|
||||||
/// * [AudioPlaybackState.none]
|
/// * [AudioPlaybackState.none]
|
||||||
Future<void> play() async {
|
Future<void> play() async {
|
||||||
|
switch (playbackState) {
|
||||||
|
case AudioPlaybackState.playing:
|
||||||
|
case AudioPlaybackState.stopped:
|
||||||
|
case AudioPlaybackState.completed:
|
||||||
|
case AudioPlaybackState.paused:
|
||||||
|
// Update local state immediately so that queries aren't surprised.
|
||||||
|
_audioPlaybackEvent = _audioPlaybackEvent.copyWith(
|
||||||
|
state: AudioPlaybackState.playing,
|
||||||
|
);
|
||||||
StreamSubscription subscription;
|
StreamSubscription subscription;
|
||||||
Completer completer = Completer();
|
Completer completer = Completer();
|
||||||
bool startedPlaying = false;
|
bool startedPlaying = false;
|
||||||
|
@ -252,12 +261,32 @@ class AudioPlayer {
|
||||||
});
|
});
|
||||||
await _invokeMethod('play');
|
await _invokeMethod('play');
|
||||||
await completer.future;
|
await completer.future;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw Exception(
|
||||||
|
"Cannot call play from connecting/none states ($playbackState)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Pauses the currently playing media. It is legal to invoke this method
|
/// Pauses the currently playing media. It is legal to invoke this method
|
||||||
/// only from the [AudioPlaybackState.playing] state.
|
/// only from the [AudioPlaybackState.playing] state.
|
||||||
Future<void> pause() async {
|
Future<void> pause() async {
|
||||||
|
switch (playbackState) {
|
||||||
|
case AudioPlaybackState.paused:
|
||||||
|
break;
|
||||||
|
case AudioPlaybackState.playing:
|
||||||
|
// Update local state immediately so that queries aren't surprised.
|
||||||
|
_audioPlaybackEvent = _audioPlaybackEvent.copyWith(
|
||||||
|
state: AudioPlaybackState.paused,
|
||||||
|
);
|
||||||
|
// TODO: For pause, perhaps modify platform side to ensure new state
|
||||||
|
// is broadcast before this method returns.
|
||||||
await _invokeMethod('pause');
|
await _invokeMethod('pause');
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw Exception(
|
||||||
|
"Can call pause only from playing and buffering states ($playbackState)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Stops the currently playing media such that the next [play] invocation
|
/// Stops the currently playing media such that the next [play] invocation
|
||||||
|
@ -268,7 +297,24 @@ class AudioPlayer {
|
||||||
/// * [AudioPlaybackState.paused]
|
/// * [AudioPlaybackState.paused]
|
||||||
/// * [AudioPlaybackState.completed]
|
/// * [AudioPlaybackState.completed]
|
||||||
Future<void> stop() async {
|
Future<void> stop() async {
|
||||||
|
switch (playbackState) {
|
||||||
|
case AudioPlaybackState.stopped:
|
||||||
|
break;
|
||||||
|
case AudioPlaybackState.connecting:
|
||||||
|
case AudioPlaybackState.completed:
|
||||||
|
case AudioPlaybackState.playing:
|
||||||
|
case AudioPlaybackState.paused:
|
||||||
|
// Update local state immediately so that queries aren't surprised.
|
||||||
|
// NOTE: Android implementation already handles this.
|
||||||
|
// TODO: Do the same for iOS so the line below becomes unnecessary.
|
||||||
|
_audioPlaybackEvent = _audioPlaybackEvent.copyWith(
|
||||||
|
state: AudioPlaybackState.paused,
|
||||||
|
);
|
||||||
await _invokeMethod('stop');
|
await _invokeMethod('stop');
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw Exception("Cannot call stop from none state");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sets the volume of this player, where 1.0 is normal volume.
|
/// Sets the volume of this player, where 1.0 is normal volume.
|
||||||
|
@ -354,6 +400,25 @@ class AudioPlaybackEvent {
|
||||||
@required this.duration,
|
@required this.duration,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
AudioPlaybackEvent copyWith({
|
||||||
|
AudioPlaybackState state,
|
||||||
|
bool buffering,
|
||||||
|
Duration updateTime,
|
||||||
|
Duration updatePosition,
|
||||||
|
Duration bufferedPosition,
|
||||||
|
double speed,
|
||||||
|
Duration duration,
|
||||||
|
}) =>
|
||||||
|
AudioPlaybackEvent(
|
||||||
|
state: state ?? this.state,
|
||||||
|
buffering: buffering ?? this.buffering,
|
||||||
|
updateTime: updateTime ?? this.updateTime,
|
||||||
|
updatePosition: updatePosition ?? this.updatePosition,
|
||||||
|
bufferedPosition: bufferedPosition ?? this.bufferedPosition,
|
||||||
|
speed: speed ?? this.speed,
|
||||||
|
duration: duration ?? this.duration,
|
||||||
|
);
|
||||||
|
|
||||||
/// The current position of the player.
|
/// The current position of the player.
|
||||||
Duration get position {
|
Duration get position {
|
||||||
if (state == AudioPlaybackState.playing && !buffering) {
|
if (state == AudioPlaybackState.playing && !buffering) {
|
||||||
|
|
Loading…
Reference in New Issue