empathicqubit/mucke
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix stop loop mode

Browse source
This commit is contained in:
Frieder Hannenheim 2023-07-12 19:12:15 +02:00
parent b1829a9d77
commit 8936ffce5b
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/lib/system/datasources/audio_player_data_source.dart
View file

@ -9,6 +9,7 @@ abstract class AudioPlayerDataSource {
Stream<PlaybackEventModel> get playbackEventStream;
ValueStream<bool> get playingStream;
ValueStream<Duration> get positionStream;
ValueStream<Duration?> get durationStream;
Future<void> play();
Future<void> pause();

6
src/lib/system/datasources/audio_player_data_source_impl.dart
View file

@ -35,6 +35,8 @@ class AudioPlayerDataSourceImpl implements AudioPlayerDataSource {
}
});
_audioPlayer.durationStream.listen((event) => _durationSubject.add(event));
_playbackEventModelStream = Rx.combineLatest2<ja.PlaybackEvent, bool, PlaybackEventModel>(
_audioPlayer.playbackEventStream,
_audioPlayer.playingStream,
@ -60,6 +62,7 @@ class AudioPlayerDataSourceImpl implements AudioPlayerDataSource {
final BehaviorSubject<PlaybackEventModel> _playbackEventSubject = BehaviorSubject();
final BehaviorSubject<bool> _playingSubject = BehaviorSubject();
final BehaviorSubject<Duration> _positionSubject = BehaviorSubject();
final BehaviorSubject<Duration?> _durationSubject = BehaviorSubject();
late Stream<PlaybackEventModel> _playbackEventModelStream;
@ -75,6 +78,9 @@ class AudioPlayerDataSourceImpl implements AudioPlayerDataSource {
@override
ValueStream<bool> get playingStream => _playingSubject.stream;
@override
ValueStream<Duration?> get durationStream => _durationSubject.stream;
@override
Future<void> dispose() async {
await _currentIndexSubject.close();

14
src/lib/system/repositories/audio_player_repository_impl.dart
View file

@ -38,9 +38,19 @@ class AudioPlayerRepositoryImpl implements AudioPlayerRepository {
_updateCurrentSong(queue, currentIndexStream.value);
}
});
_currentSongSubject.listen((song) async {
if (loopModeStream.value == LoopMode.stop)
positionStream.listen((position) async {
final durationMs = _audioPlayerDataSource.durationStream.value?.inMilliseconds;
final positionMs = position.inMilliseconds;
if (
loopModeStream.value == LoopMode.stop &&
durationMs != null &&
positionMs.compareTo(durationMs - 250) > 0 && // less than 250 milliseconds in the song remaining
_audioPlayerDataSource.playingStream.value // don't skip to next if we aren't playing
) {
await pause();
await seekToNext();
}
});
}