From ac064ec715bb39fb960153dbcffa0091b8891f32 Mon Sep 17 00:00:00 2001 From: bgk Date: Fri, 29 Aug 2008 19:04:05 +0000 Subject: [PATCH] Completely remove systemSoundOn git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@662 a31d4220-a93d-0410-bf67-fe4944624d44 --- src/System.h | 1 - src/gtk/sndPortAudio.cpp | 4 ---- src/qt/emu.cpp | 1 - src/qt/emu.h | 1 - src/sdl/sndSDL.cpp | 4 ---- src/win32/VBA.cpp | 1 - 6 files changed, 12 deletions(-) diff --git a/src/System.h b/src/System.h index 68c31502..2207b02c 100644 --- a/src/System.h +++ b/src/System.h @@ -114,7 +114,6 @@ extern void winlog(const char *,...); extern void (*dbgOutput)(const char *s, u32 addr); extern void (*dbgSignal)(int sig,int number); -extern bool systemSoundOn; extern u16 systemColorMap16[0x10000]; extern u32 systemColorMap32[0x10000]; extern u16 systemGbPalette[24]; diff --git a/src/gtk/sndPortAudio.cpp b/src/gtk/sndPortAudio.cpp index 7235a433..6562e663 100644 --- a/src/gtk/sndPortAudio.cpp +++ b/src/gtk/sndPortAudio.cpp @@ -14,8 +14,6 @@ extern int emulating; -bool systemSoundOn = false; - static PaStreamParameters outputParameters; static PaStream *stream; static PaError err; @@ -150,8 +148,6 @@ bool systemSoundInit() err = Pa_StartStream( stream ); if (err != paNoError) goto error; - systemSoundOn = true; - return true; error: Pa_Terminate(); diff --git a/src/qt/emu.cpp b/src/qt/emu.cpp index 27afbf53..5bf7e628 100644 --- a/src/qt/emu.cpp +++ b/src/qt/emu.cpp @@ -24,7 +24,6 @@ int emulating = 0; int systemFrameSkip = 0; int systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; -bool systemSoundOn = false; u32 systemColorMap32[0x10000]; u16 systemColorMap16[0x10000]; int systemRedShift = 0; diff --git a/src/qt/emu.h b/src/qt/emu.h index 6c7bce6e..8efe2bce 100644 --- a/src/qt/emu.h +++ b/src/qt/emu.h @@ -27,7 +27,6 @@ extern int emulating; extern int systemFrameSkip; extern int systemSaveUpdateCounter; -extern bool systemSoundOn; extern u32 systemColorMap32[0x10000]; extern u16 systemColorMap16[0x10000]; extern int systemRedShift; diff --git a/src/sdl/sndSDL.cpp b/src/sdl/sndSDL.cpp index f9f40e7f..a198d2b1 100644 --- a/src/sdl/sndSDL.cpp +++ b/src/sdl/sndSDL.cpp @@ -5,8 +5,6 @@ extern int emulating; -bool systemSoundOn = false; - const int sdlSoundSamples = 4096; const int sdlSoundAlign = 4; const int sdlSoundCapacity = sdlSoundSamples * 2; @@ -131,7 +129,6 @@ bool systemSoundInit() sdlSoundMutex = SDL_CreateMutex(); sdlSoundRPos = sdlSoundWPos = 0; - systemSoundOn = true; return true; } @@ -153,7 +150,6 @@ void systemSoundShutdown() SDL_CloseAudio(); emulating = iSave; - systemSoundOn = false; } void systemSoundPause() diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp index 04df0059..0b8b349e 100644 --- a/src/win32/VBA.cpp +++ b/src/win32/VBA.cpp @@ -144,7 +144,6 @@ int RGB_LOW_BITS_MASK = 0; bool b16to32Video = false; int systemFrameSkip = 0; int systemSpeed = 0; -bool systemSoundOn = false; u32 systemColorMap32[0x10000]; u16 systemColorMap16[0x10000]; u16 systemGbPalette[24];