diff -r 550db5cefcc2 -r 8a2d1c2ceb88 src/sound/win32_s.h
--- a/src/sound/win32_s.h	Wed Jun 27 01:01:16 2007 +0000
+++ b/src/sound/win32_s.h	Sat Jul 07 09:20:52 2007 +0000
@@ -3,8 +3,22 @@
 #ifndef SOUND_WIN32_H
 #define SOUND_WIN32_H
 
-#include "../hal.h"
+#include "sound_driver.hpp"
 
-extern const HalSoundDriver _win32_sound_driver;
+class SoundDriver_Win32: public SoundDriver {
+public:
+	/* virtual */ bool CanProbe() { return true; }
+
+	/* virtual */ const char *Start(const char * const *param);
+
+	/* virtual */ void Stop();
+};
+
+class FSoundDriver_Win32: public SoundDriverFactory<FSoundDriver_Win32> {
+public:
+	/* virtual */ const char *GetName() { return "win32"; }
+	/* virtual */ const char *GetDescription() { return "Win32 WaveOut Driver"; }
+	/* virtual */ Driver *CreateInstance() { return new SoundDriver_Win32(); }
+};
 
 #endif /* SOUND_WIN32_H */