From f07855afac7fc1e18b97000a92baa689d32008da Mon Sep 17 00:00:00 2001
From: Aaron VonderHaar <avh4@users.sourceforge.net>
Date: Sun, 23 Feb 2003 09:03:10 +0000
Subject: [PATCH] replace sound driver Linux with ALSA9, create arch_linux.h to
 house future linux arch includes

---
 stepmania/src/arch/arch.cpp     |  6 +++---
 stepmania/src/arch/arch.h       |  2 +-
 stepmania/src/arch/arch_linux.h | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 stepmania/src/arch/arch_linux.h

diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index e734010ea4..5e3c9319b9 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -14,7 +14,7 @@
 
 /* Override them with arch-specific drivers, as available. */
 #if defined(LINUX)
-#include "RageSoundDriver_Linux.h"
+#include "arch_linux.h"
 #elif defined(WIN32)
 #include "arch_Win32.h"
 #endif
@@ -51,8 +51,8 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers)
 			if(!DriversToTry[i].CompareNoCase("DirectSound-sw")) ret = new RageSound_DSound_Software;
 			if(!DriversToTry[i].CompareNoCase("WaveOut")) ret = new RageSound_WaveOut;
 #endif
-#ifdef LINUX	
-			if(!DriversToTry[i].CompareNoCase("Linux")) ret = new RageSound_Linux;
+#ifdef LINUX	/* should use some define akin to HAS_ALSA9 */
+			if(!DriversToTry[i].CompareNoCase("ALSA9")) ret = new RageSound_ALSA9;
 #endif		
 			if(!DriversToTry[i].CompareNoCase("Null")) ret = new RageSound_Null;
 			if( !ret )
diff --git a/stepmania/src/arch/arch.h b/stepmania/src/arch/arch.h
index 0cb358d1f1..cd63afee92 100644
--- a/stepmania/src/arch/arch.h
+++ b/stepmania/src/arch/arch.h
@@ -17,7 +17,7 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers);
 
 /* Define the default list of sound drivers for each arch. */
 #if defined(LINUX)
-#define DEFAULT_SOUND_DRIVER_LIST "Linux"
+#define DEFAULT_SOUND_DRIVER_LIST "ALSA9,Null"
 #elif defined(WIN32)
 #define DEFAULT_SOUND_DRIVER_LIST "DirectSound,DirectSound-sw,WaveOut"
 #else
diff --git a/stepmania/src/arch/arch_linux.h b/stepmania/src/arch/arch_linux.h
new file mode 100644
index 0000000000..bc11f76065
--- /dev/null
+++ b/stepmania/src/arch/arch_linux.h
@@ -0,0 +1,14 @@
+#ifndef LINUX_ARCH_H
+#define LINUX_ARCH_H
+
+/* #ifdef HAS_ALSA9 */
+#include "Sound/RageSoundDriver_ALSA9.h"
+/* #endif HAS_ALSA9 */
+
+#endif
+
+/*
+ * Copyright (c) 2002 by the person(s) listed below.  All rights reserved.
+ *
+ * Glenn Maynard
+ */