From 8a65835e044bacc275cdadca5d1674b1b15b5696 Mon Sep 17 00:00:00 2001 From: Allison Ryan Date: Tue, 10 May 2022 10:37:52 -0500 Subject: [PATCH] fix: flipper audio pooling --- .../pinball_audio/lib/src/pinball_audio.dart | 36 +------------------ .../test/src/pinball_audio_test.dart | 3 +- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/packages/pinball_audio/lib/src/pinball_audio.dart b/packages/pinball_audio/lib/src/pinball_audio.dart index 796c8cdc..78b6cea3 100644 --- a/packages/pinball_audio/lib/src/pinball_audio.dart +++ b/packages/pinball_audio/lib/src/pinball_audio.dart @@ -148,38 +148,6 @@ class _SingleLoopAudio extends _LoopAudio { } } -class _SingleAudioPool extends _Audio { - _SingleAudioPool({ - required this.path, - required this.duration, - required this.maxPlayers, - required this.preCacheSingleAudio, - required this.playSingleAudio, - }); - - final String path; - final int maxPlayers; - final Duration duration; - final PreCacheSingleAudio preCacheSingleAudio; - final PlaySingleAudio playSingleAudio; - late PinballAudioPool pool; - - @override - Future load() async { - pool = PinballAudioPool( - path: prefixFile(path), - poolSize: maxPlayers, - preCacheSingleAudio: preCacheSingleAudio, - playSingleAudio: playSingleAudio, - duration: duration, - ); - await pool.load(); - } - - @override - void play() => pool.play(); -} - class _RandomABAudio extends _Audio { _RandomABAudio({ required this.preCacheSingleAudio, @@ -315,12 +283,10 @@ class PinballAudioPlayer { path: Assets.sfx.rollover, volume: 0.3, ), - PinballAudio.flipper: _SingleAudioPool( + PinballAudio.flipper: _SimplePlayAudio( path: Assets.sfx.flipper, - maxPlayers: 4, preCacheSingleAudio: _preCacheSingleAudio, playSingleAudio: _playSingleAudio, - duration: const Duration(milliseconds: 200), ), PinballAudio.ioPinballVoiceOver: _SimplePlayAudio( preCacheSingleAudio: _preCacheSingleAudio, diff --git a/packages/pinball_audio/test/src/pinball_audio_test.dart b/packages/pinball_audio/test/src/pinball_audio_test.dart index 9fd5b8e7..6a77046b 100644 --- a/packages/pinball_audio/test/src/pinball_audio_test.dart +++ b/packages/pinball_audio/test/src/pinball_audio_test.dart @@ -247,8 +247,7 @@ void main() { }); group('flipper', () { - test('plays the flipper sound pool', () async { - when(seed.nextBool).thenReturn(true); + test('plays the correct file', () async { await Future.wait( audioPlayer.load().map((loadableBuilder) => loadableBuilder()), );