EOL fixes

This commit is contained in:
elasota
2020-01-20 02:16:34 -05:00
parent e5932eef3b
commit c9f3e5aba6
2 changed files with 25 additions and 25 deletions

View File

@@ -1,13 +1,13 @@
#include "GpAudioDriverFactoryXAudio2.h" #include "GpAudioDriverFactoryXAudio2.h"
#include "GpAudioDriverXAudio2.h" #include "GpAudioDriverXAudio2.h"
IGpAudioDriver *GpAudioDriverFactoryXAudio2::Create(const GpAudioDriverProperties &properties) IGpAudioDriver *GpAudioDriverFactoryXAudio2::Create(const GpAudioDriverProperties &properties)
{ {
return GpAudioDriverXAudio2::Create(properties); return GpAudioDriverXAudio2::Create(properties);
} }
extern "C" __declspec(dllexport) IGpAudioDriver *GpDriver_CreateAudioDriver_XAudio2(const GpAudioDriverProperties &properties) extern "C" __declspec(dllexport) IGpAudioDriver *GpDriver_CreateAudioDriver_XAudio2(const GpAudioDriverProperties &properties)
{ {
return GpAudioDriverFactoryXAudio2::Create(properties); return GpAudioDriverFactoryXAudio2::Create(properties);
} }

View File

@@ -1,33 +1,33 @@
#pragma once #pragma once
#include "IGpAudioDriver.h" #include "IGpAudioDriver.h"
#include "GpCoreDefs.h" #include "GpCoreDefs.h"
#include "GpAudioDriverProperties.h" #include "GpAudioDriverProperties.h"
struct IXAudio2; struct IXAudio2;
struct IXAudio2MasteringVoice; struct IXAudio2MasteringVoice;
class GpAudioDriverXAudio2 : public IGpAudioDriver class GpAudioDriverXAudio2 : public IGpAudioDriver
{ {
public: public:
IGpAudioChannel *CreateChannel() override; IGpAudioChannel *CreateChannel() override;
void SetMasterVolume(uint32_t vol, uint32_t maxVolume) override; void SetMasterVolume(uint32_t vol, uint32_t maxVolume) override;
void Shutdown() override; void Shutdown() override;
const GpAudioDriverProperties &GetProperties() const; const GpAudioDriverProperties &GetProperties() const;
IXAudio2 *GetXA2() const; IXAudio2 *GetXA2() const;
IXAudio2MasteringVoice *GetMasteringVoice() const; IXAudio2MasteringVoice *GetMasteringVoice() const;
unsigned int GetRealSampleRate() const; unsigned int GetRealSampleRate() const;
static GpAudioDriverXAudio2 *Create(const GpAudioDriverProperties &properties); static GpAudioDriverXAudio2 *Create(const GpAudioDriverProperties &properties);
private: private:
GpAudioDriverXAudio2(const GpAudioDriverProperties &properties, unsigned int realSampleRate, IXAudio2* xa2, IXAudio2MasteringVoice *mv); GpAudioDriverXAudio2(const GpAudioDriverProperties &properties, unsigned int realSampleRate, IXAudio2* xa2, IXAudio2MasteringVoice *mv);
~GpAudioDriverXAudio2(); ~GpAudioDriverXAudio2();
GpAudioDriverProperties m_properties; GpAudioDriverProperties m_properties;
IXAudio2* m_xa2; IXAudio2* m_xa2;
IXAudio2MasteringVoice *m_mv; IXAudio2MasteringVoice *m_mv;
unsigned int m_realSampleRate; unsigned int m_realSampleRate;
}; };