From 93a578d40a654a512d52407c734037e2c631a0f4 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sat, 13 Jun 2015 13:21:24 -0700
Subject: [PATCH] Refactor : remove and rename certain globals

---
 src/audio/mockingboard.c |  7 +++----
 src/audio/soundcore.c    | 12 +++++-------
 src/audio/soundcore.h    |  6 +-----
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/audio/mockingboard.c b/src/audio/mockingboard.c
index 98bb1ad8..ecc5e39c 100644
--- a/src/audio/mockingboard.c
+++ b/src/audio/mockingboard.c
@@ -1371,7 +1371,7 @@ static bool MB_DSInit()
 	unsigned long dwDSLockedBufferSize = 0;    // Size of the locked DirectSound buffer
 	int16_t* pDSLockedBuffer;
 
-	if(!g_bDSAvailable)
+	if(!soundcore_isAvailable)
 		return false;
 
 	int hr = DSGetSoundBuffer(&MockingboardVoice, DSBCAPS_CTRLVOLUME, g_dwDSBufferSize, SAMPLE_RATE, 2);
@@ -1672,8 +1672,7 @@ void MB_Initialize()
 #ifdef APPLE2IX
     memset(SSI263Voice, 0x0, sizeof(VOICE)*MAX_VOICES);
 #endif
-	LOG("MB_Initialize: g_bDisableDirectSound=%d, g_bDisableDirectSoundMockingboard=%d\n", g_bDisableDirectSound, g_bDisableDirectSoundMockingboard);
-	if (g_bDisableDirectSound || g_bDisableDirectSoundMockingboard)
+	if (g_bDisableDirectSoundMockingboard)
 	{
 		MockingboardVoice.bMute = true;
 		g_SoundcardType = CT_Empty;
@@ -1758,7 +1757,7 @@ static void ResetState()
 
 void MB_Reset()
 {
-	if(!g_bDSAvailable)
+	if(!soundcore_isAvailable)
 		return;
 
 	for(int i=0; i<NUM_AY8910; i++)
diff --git a/src/audio/soundcore.c b/src/audio/soundcore.c
index 10944ad9..e702d946 100644
--- a/src/audio/soundcore.c
+++ b/src/audio/soundcore.c
@@ -50,9 +50,7 @@ static VOICE* g_pSpeakerVoice = NULL;
 
 //-------------------------------------
 
-bool g_bDSAvailable = false;
-
-bool g_bDisableDirectSound = false;
+bool soundcore_isAvailable = false;
 
 //-----------------------------------------------------------------------------
 
@@ -241,7 +239,7 @@ static void _destroy_enumerated_sound_devices(void) {
 
 bool DSInit()
 {
-    if(g_bDSAvailable)
+    if(soundcore_isAvailable)
     {
         g_uDSInitRefCount++;
         return true;        // Already initialised successfully
@@ -280,7 +278,7 @@ bool DSInit()
         return false;
     }
 
-    g_bDSAvailable = true;
+    soundcore_isAvailable = true;
 
     g_uDSInitRefCount = 1;
 
@@ -293,7 +291,7 @@ void DSUninit()
 {
     _destroy_enumerated_sound_devices();
 
-    if(!g_bDSAvailable)
+    if(!soundcore_isAvailable)
         return;
 
     assert(g_uDSInitRefCount);
@@ -311,7 +309,7 @@ void DSUninit()
     assert(g_uNumVoices == 0);
 
         SoundSystemDestroy((SoundSystemStruct**)&g_lpDS);
-    g_bDSAvailable = false;
+    soundcore_isAvailable = false;
 }
 
 //=============================================================================
diff --git a/src/audio/soundcore.h b/src/audio/soundcore.h
index 433390e5..3db7be69 100644
--- a/src/audio/soundcore.h
+++ b/src/audio/soundcore.h
@@ -21,8 +21,6 @@
 
 #define MAX_SAMPLES (8*1024)
 
-extern bool g_bDisableDirectSound;
-
 typedef struct
 {
     LPDIRECTSOUNDBUFFER lpDSBvoice;
@@ -62,9 +60,7 @@ void SoundCore_SetErrorMax(const int nErrorMax);
 bool DSInit();
 void DSUninit();
 
-//
-
-extern bool g_bDSAvailable;
+extern bool soundcore_isAvailable;
 
 #ifdef APPLE2IX
 typedef struct IDirectSound SoundSystemStruct;