refactor: bind audio resume to resume

thenick775 · Dec 1, 2024 · b691210 · b691210
1 parent 2f6721c
commit b691210
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/gbajs3/src/emulator/mgba/mgba-emulator.tsx b/gbajs3/src/emulator/mgba/mgba-emulator.tsx
@@ -57,8 +57,7 @@ export type GBAEmulator = {
   quitEmulator: () => void;
   quitGame: () => void;
   remapKeyBindings: (keyBindings: KeyBinding[]) => void;
-  resume: () => void;
-  resumeAudio: () => void;
+  resume: () => Promise<void>;
   run: (romPath: string) => boolean;
   screenshot: (fileName?: string) => boolean;
   setCurrentGameName: (gameName: string | undefined) => void;
@@ -223,12 +222,7 @@ export const mGBAEmulator = (mGBA: mGBAEmulatorTypeDef): GBAEmulator => {
     loadSaveState: mGBA.loadState,
     listSaveStates: () => mGBA.FS.readdir(paths.saveStatePath),
     listRoms: mGBA.listRoms,
-    setVolume: async (volumePercent) => {
-      await resumeAudio();
-
-      mGBA.setVolume(volumePercent);
-    },
-    resumeAudio: resumeAudio,
+    setVolume: mGBA.setVolume,
     getVolume: mGBA.getVolume,
     enableKeyboardInput: () => mGBA.toggleInput(true),
     disableKeyboardInput: () => mGBA.toggleInput(false),
@@ -257,7 +251,10 @@ export const mGBAEmulator = (mGBA: mGBAEmulatorTypeDef): GBAEmulator => {
     },
     deleteFile: mGBA.FS.unlink,
     pause: mGBA.pauseGame,
-    resume: mGBA.resumeGame,
+    resume: async () => {
+      await resumeAudio();
+      mGBA.resumeGame();
+    },
     quitGame: mGBA.quitGame,
     quitEmulator: mGBA.quitMgba,
     quickReload: mGBA.quickReload,

diff --git a/gbajs3/src/hooks/emulator/use-background-emulator.spec.tsx b/gbajs3/src/hooks/emulator/use-background-emulator.spec.tsx
@@ -19,15 +19,13 @@ describe('useBackgroundEmulator hook', () => {
   it('pauses emulator when entering background if running and not paused', () => {
     const emulatorPauseSpy: () => void = vi.fn();
     const emulatorResumeSpy: () => void = vi.fn();
-    const emulatorResumeAudioSpy: () => void = vi.fn();
 
     vi.spyOn(contextHooks, 'useEmulatorContext').mockImplementation(() => ({
       setCanvas: vi.fn(),
       canvas: null,
       emulator: {
         pause: emulatorPauseSpy,
-        resume: emulatorResumeSpy,
-        resumeAudio: emulatorResumeAudioSpy
+        resume: emulatorResumeSpy
       } as GBAEmulator
     }));
 
@@ -50,6 +48,5 @@ describe('useBackgroundEmulator hook', () => {
 
     // resumes emulator when coming back from background
     expect(emulatorResumeSpy).toHaveBeenCalledOnce();
-    expect(emulatorResumeAudioSpy).toHaveBeenCalledOnce();
   });
 });
diff --git a/gbajs3/src/hooks/emulator/use-background-emulator.tsx b/gbajs3/src/hooks/emulator/use-background-emulator.tsx
@@ -27,7 +27,6 @@ export const useBackgroundEmulator = ({
         setPausedForBackground(true);
       } else if (isDocumentVisible && pausedForBackground) {
         emulator?.resume();
-        emulator?.resumeAudio();
         setPausedForBackground(false);
       }
     }