From ec8a47a61bdc7827eb3862814f893026f6ac3e58 Mon Sep 17 00:00:00 2001
From: Erick Zanardo <erickzanardoo@gmail.com>
Date: Thu, 5 May 2022 13:43:58 -0300
Subject: [PATCH] fixing rebase

---
 packages/pinball_audio/lib/src/pinball_audio.dart       | 8 +++++---
 packages/pinball_audio/test/src/pinball_audio_test.dart | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/pinball_audio/lib/src/pinball_audio.dart b/packages/pinball_audio/lib/src/pinball_audio.dart
index afb0ed90..dd3e8242 100644
--- a/packages/pinball_audio/lib/src/pinball_audio.dart
+++ b/packages/pinball_audio/lib/src/pinball_audio.dart
@@ -6,7 +6,6 @@ import 'package:flame_audio/flame_audio.dart';
 import 'package:flutter/material.dart';
 import 'package:pinball_audio/gen/assets.gen.dart';
 
-<<<<<<< HEAD
 /// Sounds available for play
 enum PinballAudio {
   /// Google
@@ -25,8 +24,6 @@ enum PinballAudio {
   gameOverVoiceOver,
 }
 
-=======
->>>>>>> e6fa2ea (docs nits)
 /// Defines the contract of the creation of an [AudioPool].
 typedef CreateAudioPool = Future<AudioPool> Function(
   String sound, {
@@ -166,6 +163,11 @@ class PinballPlayer {
         playSingleAudio: _playSingleAudio,
         path: Assets.sfx.ioPinballVoiceOver,
       ),
+      PinballAudio.gameOverVoiceOver: _SimplePlayAudio(
+        preCacheSingleAudio: _preCacheSingleAudio,
+        playSingleAudio: _playSingleAudio,
+        path: Assets.sfx.gameOverVoiceOver,
+      ),
       PinballAudio.bumper: _BumperAudio(
         createAudioPool: _createAudioPool,
         seed: _seed,
diff --git a/packages/pinball_audio/test/src/pinball_audio_test.dart b/packages/pinball_audio/test/src/pinball_audio_test.dart
index 59a0c60c..b7760aa5 100644
--- a/packages/pinball_audio/test/src/pinball_audio_test.dart
+++ b/packages/pinball_audio/test/src/pinball_audio_test.dart
@@ -234,8 +234,8 @@ void main() {
 
     group('gameOverVoiceOver', () {
       test('plays the correct file', () async {
-        await audio.load();
-        audio.gameOverVoiceOver();
+        await Future.wait(player.load());
+        player.play(PinballAudio.gameOverVoiceOver);
 
         verify(
           () => playSingleAudio.onCall(