fixing rebase

pull/320/head
Erick Zanardo 3 years ago
parent ed5794a579
commit ec8a47a61b

@ -6,7 +6,6 @@ import 'package:flame_audio/flame_audio.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:pinball_audio/gen/assets.gen.dart'; import 'package:pinball_audio/gen/assets.gen.dart';
<<<<<<< HEAD
/// Sounds available for play /// Sounds available for play
enum PinballAudio { enum PinballAudio {
/// Google /// Google
@ -25,8 +24,6 @@ enum PinballAudio {
gameOverVoiceOver, gameOverVoiceOver,
} }
=======
>>>>>>> e6fa2ea (docs nits)
/// Defines the contract of the creation of an [AudioPool]. /// Defines the contract of the creation of an [AudioPool].
typedef CreateAudioPool = Future<AudioPool> Function( typedef CreateAudioPool = Future<AudioPool> Function(
String sound, { String sound, {
@ -166,6 +163,11 @@ class PinballPlayer {
playSingleAudio: _playSingleAudio, playSingleAudio: _playSingleAudio,
path: Assets.sfx.ioPinballVoiceOver, path: Assets.sfx.ioPinballVoiceOver,
), ),
PinballAudio.gameOverVoiceOver: _SimplePlayAudio(
preCacheSingleAudio: _preCacheSingleAudio,
playSingleAudio: _playSingleAudio,
path: Assets.sfx.gameOverVoiceOver,
),
PinballAudio.bumper: _BumperAudio( PinballAudio.bumper: _BumperAudio(
createAudioPool: _createAudioPool, createAudioPool: _createAudioPool,
seed: _seed, seed: _seed,

@ -234,8 +234,8 @@ void main() {
group('gameOverVoiceOver', () { group('gameOverVoiceOver', () {
test('plays the correct file', () async { test('plays the correct file', () async {
await audio.load(); await Future.wait(player.load());
audio.gameOverVoiceOver(); player.play(PinballAudio.gameOverVoiceOver);
verify( verify(
() => playSingleAudio.onCall( () => playSingleAudio.onCall(

Loading…
Cancel
Save