style

stepmania/src/arch/Dialog/DialogDriver.h

@@ -6,10 +6,10 @@
 class DialogDriver
 {
 public:
-	virtual void Error( CString sMessage, CString ID ) { printf("Error: %s\n", sMessage.c_str()); }
-	virtual void OK( CString sMessage, CString ID ) {}
-	virtual Dialog::Result AbortRetryIgnore( CString sMessage, CString ID ) { return Dialog::ignore; } 
-	virtual Dialog::Result AbortRetry( CString sMessage, CString ID ) { return Dialog::abort; } 
+	virtual void Error( CString sMessage, CString sID ) { printf("Error: %s\n", sMessage.c_str()); }
+	virtual void OK( CString sMessage, CString sID ) {}
+	virtual Dialog::Result AbortRetryIgnore( CString sMessage, CString sID ) { return Dialog::ignore; } 
+	virtual Dialog::Result AbortRetry( CString sMessage, CString sID ) { return Dialog::abort; } 
 
 	virtual CString Init() { return ""; }
 	virtual ~DialogDriver() { }

stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h

@@ -1,15 +1,22 @@
-#ifndef RAGE_SOUND_WAVEOUT
-#define RAGE_SOUND_WAVEOUT
+#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"
-#include "RageTimer.h"
+#include <windows.h>
+#include <mmsystem.h>
 
 class RageSound_WaveOut: public RageSound_Generic_Software
 {
+public:
+	int64_t GetPosition( const RageSoundBase *snd ) const;
+	float GetPlayLatency() const;
+
+	RageSound_WaveOut();
+	~RageSound_WaveOut();
+	CString Init();
+
+private:
 	HWAVEOUT wo;
 	HANDLE sound_event;
 	WAVEHDR buffers[8];
@@ -21,16 +28,7 @@ class RageSound_WaveOut: public RageSound_Generic_Software
 	RageThread MixingThread;
 	bool GetData();
 
-protected:
 	void SetupDecodingThread();
-
-public:
-	int64_t GetPosition( const RageSoundBase *snd ) const;
-	float GetPlayLatency() const;
-
-	RageSound_WaveOut();
-	~RageSound_WaveOut();
-	CString Init();
 };
 #define USE_RAGE_SOUND_WAVE_OUT