From 5486753c90c5fa012f2dcf5b27bcd2c14e40a9d8 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 18 Jan 2007 09:20:56 +0000
Subject: [PATCH] RageSoundDriver

---
 stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h     | 4 ++--
 stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h    | 4 ++--
 stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp | 2 +-
 stepmania/src/arch/Sound/RageSoundDriver_Null.h               | 4 ++--
 stepmania/src/arch/Sound/RageSoundDriver_OSS.h                | 4 ++--
 stepmania/src/arch/Sound/RageSoundDriver_WDMKS.h              | 4 ++--
 stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h            | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h
index 91c1add857..b4eeb41219 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9_Software.h
@@ -3,11 +3,11 @@
 
 #include "RageSound.h"
 #include "RageThreads.h"
-#include "RageSoundDriver_Generic_Software.h"
+#include "RageSoundDriver.h"
 
 #include "ALSA9Helpers.h"
 
-class RageSoundDriver_ALSA9_Software: public RageSound_Generic_Software
+class RageSoundDriver_ALSA9_Software: public RageSoundDriver
 {
 public:
 	RageSoundDriver_ALSA9_Software();
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
index 5c3dd163fd..68462f88e5 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.h
@@ -3,9 +3,9 @@
 
 #include "DSoundHelpers.h"
 #include "RageThreads.h"
-#include "RageSoundDriver_Generic_Software.h"
+#include "RageSoundDriver.h"
 
-class RageSoundDriver_DSound_Software: public RageSound_Generic_Software
+class RageSoundDriver_DSound_Software: public RageSoundDriver
 {
 public:
 	RageSoundDriver_DSound_Software();
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
index 2d4a4dd16d..300b4294af 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
+++ b/stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "RageSoundDriver_Generic_Software.h"
+#include "RageSoundDriver.h"
 
 #include "RageLog.h"
 #include "RageSound.h"
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.h b/stepmania/src/arch/Sound/RageSoundDriver_Null.h
index 3949e878ce..eed50d25f0 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_Null.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.h
@@ -1,9 +1,9 @@
 #ifndef RAGE_SOUND_NULL
 #define RAGE_SOUND_NULL
 
-#include "RageSoundDriver_Generic_Software.h"
+#include "RageSoundDriver.h"
 
-class RageSoundDriver_Null: public RageSound_Generic_Software
+class RageSoundDriver_Null: public RageSoundDriver
 {
 public:
 	RageSoundDriver_Null();
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_OSS.h b/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
index 7ba43ac42a..82a72f054d 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_OSS.h
@@ -1,11 +1,11 @@
 #ifndef RAGE_SOUND_WAVEOUT
 #define RAGE_SOUND_WAVEOUT
 
-#include "RageSoundDriver_Generic_Software.h"
+#include "RageSoundDriver.h"
 #include "RageThreads.h"
 #include "RageTimer.h"
 
-class RageSoundDriver_OSS: public RageSound_Generic_Software
+class RageSoundDriver_OSS: public RageSoundDriver
 {
 	int fd;
 
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.h b/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.h
index 8eff77d307..6ee3ef4130 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WDMKS.h
@@ -1,14 +1,14 @@
 #ifndef RAGE_SOUND_WAVEOUT_H
 #define RAGE_SOUND_WAVEOUT_H
 
-#include "RageSoundDriver_Generic_Software.h"
+#include "RageSoundDriver.h"
 #include "RageThreads.h"
 #include <windows.h>
 
 struct WinWdmStream;
 struct WinWdmFilter;
 
-class RageSoundDriver_WDMKS: public RageSound_Generic_Software
+class RageSoundDriver_WDMKS: public RageSoundDriver
 {
 public:
 	RageSoundDriver_WDMKS();
diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
index 8306a4360e..df43d37a27 100644
--- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
+++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h
@@ -1,12 +1,12 @@
 #ifndef RAGE_SOUND_WAVEOUT_H
 #define RAGE_SOUND_WAVEOUT_H
 
-#include "RageSoundDriver_Generic_Software.h"
+#include "RageSoundDriver.h"
 #include "RageThreads.h"
 #include <windows.h>
 #include <mmsystem.h>
 
-class RageSoundDriver_WaveOut: public RageSound_Generic_Software
+class RageSoundDriver_WaveOut: public RageSoundDriver
 {
 public:
 	RageSoundDriver_WaveOut();