From f3b188b69dca11d775a69300c528da64dd9aa470 Mon Sep 17 00:00:00 2001
From: mcmartin <mcmartin@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Thu, 8 Dec 2005 05:50:51 +0000
Subject: [PATCH] Moved snddriver and soundflags to audiocore.

This is "temporary" in that all these global config variables will be
referenced via the global named resource system in the end.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2040 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/sc2code/libs/sound/audiocore.c | 3 +++
 sc2/src/sc2code/libs/sound/audiocore.h | 2 ++
 sc2/src/starcon2.c                     | 3 ---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sc2/src/sc2code/libs/sound/audiocore.c b/sc2/src/sc2code/libs/sound/audiocore.c
index b9fbe0411..f73c91dab 100644
--- a/sc2/src/sc2code/libs/sound/audiocore.c
+++ b/sc2/src/sc2code/libs/sound/audiocore.c
@@ -23,6 +23,9 @@
 
 static audio_Driver audiodrv;
 
+/* The globals that control the sound drivers. */
+int snddriver, soundflags;
+
 /*
  * Declarations for driver init funcs
  */
diff --git a/sc2/src/sc2code/libs/sound/audiocore.h b/sc2/src/sc2code/libs/sound/audiocore.h
index 82e826d8b..66b7025da 100644
--- a/sc2/src/sc2code/libs/sound/audiocore.h
+++ b/sc2/src/sc2code/libs/sound/audiocore.h
@@ -83,6 +83,8 @@ enum
 	audio_ENUM_SIZE
 };
 
+extern int snddriver, soundflags;
+
 typedef struct {
 	/* General */
 	void (* Uninitialize) (void);
diff --git a/sc2/src/starcon2.c b/sc2/src/starcon2.c
index 635f396da..968ba0862 100644
--- a/sc2/src/starcon2.c
+++ b/sc2/src/starcon2.c
@@ -94,9 +94,6 @@ static int Check_PC_3DO_opt (const char *value, DWORD mask, const char *opt,
 		int *result);
 static const char *PC_3DO_optString (DWORD optMask);
 
-/* TODO: Remove these global variables once threading is gone. */
-int snddriver, soundflags;
-
 int
 main (int argc, char *argv[])
 {