This commit is contained in:
Glenn Maynard
2005-06-03 23:55:04 +00:00
parent 0b5f634e4a
commit f9a3918d37
2 changed files with 17 additions and 19 deletions
+4 -4
View File
@@ -6,10 +6,10 @@
class DialogDriver class DialogDriver
{ {
public: public:
virtual void Error( CString sMessage, CString ID ) { printf("Error: %s\n", sMessage.c_str()); } virtual void Error( CString sMessage, CString sID ) { printf("Error: %s\n", sMessage.c_str()); }
virtual void OK( CString sMessage, CString ID ) {} virtual void OK( CString sMessage, CString sID ) {}
virtual Dialog::Result AbortRetryIgnore( CString sMessage, CString ID ) { return Dialog::ignore; } virtual Dialog::Result AbortRetryIgnore( CString sMessage, CString sID ) { return Dialog::ignore; }
virtual Dialog::Result AbortRetry( CString sMessage, CString ID ) { return Dialog::abort; } virtual Dialog::Result AbortRetry( CString sMessage, CString sID ) { return Dialog::abort; }
virtual CString Init() { return ""; } virtual CString Init() { return ""; }
virtual ~DialogDriver() { } virtual ~DialogDriver() { }
@@ -1,15 +1,22 @@
#ifndef RAGE_SOUND_WAVEOUT #ifndef RAGE_SOUND_WAVEOUT_H
#define RAGE_SOUND_WAVEOUT #define RAGE_SOUND_WAVEOUT_H
#include "RageSoundDriver_Generic_Software.h" #include "RageSoundDriver_Generic_Software.h"
#include "RageSoundDriver.h"
#include "RageThreads.h" #include "RageThreads.h"
#include "windows.h" #include <windows.h>
#include "Mmsystem.h" #include <mmsystem.h>
#include "RageTimer.h"
class RageSound_WaveOut: public RageSound_Generic_Software 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; HWAVEOUT wo;
HANDLE sound_event; HANDLE sound_event;
WAVEHDR buffers[8]; WAVEHDR buffers[8];
@@ -21,16 +28,7 @@ class RageSound_WaveOut: public RageSound_Generic_Software
RageThread MixingThread; RageThread MixingThread;
bool GetData(); bool GetData();
protected:
void SetupDecodingThread(); 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 #define USE_RAGE_SOUND_WAVE_OUT