diff options
Diffstat (limited to 'drivers/xaudio2/audio_driver_xaudio2.h')
| -rw-r--r-- | drivers/xaudio2/audio_driver_xaudio2.h | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/drivers/xaudio2/audio_driver_xaudio2.h b/drivers/xaudio2/audio_driver_xaudio2.h index afafb84c2..9a37ba7a7 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.h +++ b/drivers/xaudio2/audio_driver_xaudio2.h @@ -29,15 +29,15 @@ #ifndef AUDIO_DRIVER_XAUDIO2_H #define AUDIO_DRIVER_XAUDIO2_H -#include "servers/audio_server.h" -#include "core/os/thread.h" #include "core/os/mutex.h" +#include "core/os/thread.h" +#include "servers/audio_server.h" -#include <windows.h> -#include <mmsystem.h> #include <mmreg.h> -#include <xaudio2.h> +#include <mmsystem.h> +#include <windows.h> #include <wrl/client.h> +#include <xaudio2.h> class AudioDriverXAudio2 : public AudioDriver { @@ -48,26 +48,28 @@ class AudioDriverXAudio2 : public AudioDriver { struct XAudio2DriverVoiceCallback : public IXAudio2VoiceCallback { HANDLE buffer_end_event; - XAudio2DriverVoiceCallback() : buffer_end_event(CreateEvent(NULL, FALSE, FALSE, NULL)) {} - void STDMETHODCALLTYPE OnBufferEnd(void* pBufferContext) { /*print_line("buffer ended");*/ SetEvent(buffer_end_event); } + XAudio2DriverVoiceCallback() + : buffer_end_event(CreateEvent(NULL, FALSE, FALSE, NULL)) {} + void STDMETHODCALLTYPE OnBufferEnd(void *pBufferContext) { /*print_line("buffer ended");*/ + SetEvent(buffer_end_event); + } //Unused methods are stubs void STDMETHODCALLTYPE OnStreamEnd() {} void STDMETHODCALLTYPE OnVoiceProcessingPassEnd() {} void STDMETHODCALLTYPE OnVoiceProcessingPassStart(UINT32 SamplesRequired) {} - void STDMETHODCALLTYPE OnBufferStart(void * pBufferContext) {} - void STDMETHODCALLTYPE OnLoopEnd(void * pBufferContext) {} - void STDMETHODCALLTYPE OnVoiceError(void * pBufferContext, HRESULT Error) {} - + void STDMETHODCALLTYPE OnBufferStart(void *pBufferContext) {} + void STDMETHODCALLTYPE OnLoopEnd(void *pBufferContext) {} + void STDMETHODCALLTYPE OnVoiceError(void *pBufferContext, HRESULT Error) {} }; - Thread* thread; - Mutex* mutex; + Thread *thread; + Mutex *mutex; - int32_t* samples_in; - int16_t* samples_out[AUDIO_BUFFERS]; + int32_t *samples_in; + int16_t *samples_out[AUDIO_BUFFERS]; - static void thread_func(void* p_udata); + static void thread_func(void *p_udata); int buffer_size; unsigned int mix_rate; @@ -83,14 +85,13 @@ class AudioDriverXAudio2 : public AudioDriver { WAVEFORMATEX wave_format; Microsoft::WRL::ComPtr<IXAudio2> xaudio; int current_buffer; - IXAudio2MasteringVoice* mastering_voice; + IXAudio2MasteringVoice *mastering_voice; XAUDIO2_BUFFER xaudio_buffer[AUDIO_BUFFERS]; - IXAudio2SourceVoice* source_voice; + IXAudio2SourceVoice *source_voice; XAudio2DriverVoiceCallback voice_callback; public: - - const char* get_name() const; + const char *get_name() const; virtual Error init(); virtual void start(); |