Merge pull request #95 from Bagietas/main

XAudio2_9 fix to maintain consistency in repo
This commit is contained in:
Serenity
2025-01-07 14:22:35 -05:00
committed by GitHub
5 changed files with 6 additions and 68 deletions

View File

@@ -1,8 +1,8 @@
LIBRARY XAudio2_9
EXPORTS
CreateAudioReverb = CreateAudioReverb_X @1
CreateAudioVolumeMeter = CreateAudioVolumeMeter_X @2
CreateFX = CreateFX_X @3
CreateXAudio2Object = CreateXAudio2Object_X @4
X3DAudioCalculate = X3DAudioCalculate_X @5
X3DAudioInitialize = X3DAudioInitialize_X @6
CreateAudioReverb = XAudio2_9.CreateAudioReverb @1
CreateAudioVolumeMeter = XAudio2_9.CreateAudioVolumeMeter @2
CreateFX = XAudio2_9.CreateFX @3
CreateXAudio2Object = XAudio2_9.XAudio2Create @4
X3DAudioCalculate = XAudio2_9.X3DAudioCalculate @5
X3DAudioInitialize = XAudio2_9.X3DAudioInitialize @6

View File

@@ -1,35 +0,0 @@
#include "pch.h"
#include "xaudio2.h"
#include "xaudio2fx.h"
#include "x3daudio.h"
#include "xapofx.h"
HRESULT CreateAudioReverb_X(IUnknown **ppApo)
{
return CreateAudioReverb(ppApo);
}
HRESULT CreateAudioVolumeMeter_X(IUnknown** ppApo)
{
return CreateAudioVolumeMeter(ppApo);
}
HRESULT CreateFX_X(REFCLSID clsid, IUnknown** pEffect, const void* pInitDat, UINT32 InitDataByteSize)
{
return CreateFX(clsid, pEffect, pInitDat, InitDataByteSize);
}
HRESULT CreateXAudio2Object_X(IXAudio2** ppXAudio2, UINT32 Flags, XAUDIO2_PROCESSOR XAudio2Processor)
{
return XAudio2Create(ppXAudio2, Flags, XAudio2Processor);
}
void X3DAudioCalculate_X(const X3DAUDIO_HANDLE Instance, const X3DAUDIO_LISTENER* pListener, const X3DAUDIO_EMITTER* pEmitter, UINT32 Flags, X3DAUDIO_DSP_SETTINGS* pDSPSettings)
{
return X3DAudioCalculate(Instance, pListener, pEmitter, Flags, pDSPSettings);
}
HRESULT X3DAudioInitialize_X(UINT32 SpeakerChannelMask, FLOAT32 SpeedOfSound, X3DAUDIO_HANDLE Instance)
{
return X3DAudioInitialize(SpeakerChannelMask, SpeedOfSound, Instance);
}

View File

@@ -148,14 +148,12 @@
<ClInclude Include="pch.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="XAudio2_9.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="Exports.def" />

View File

@@ -23,15 +23,9 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="pch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="XAudio2_9.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="Exports.def">

View File

@@ -1,19 +0,0 @@
// dllmain.cpp : Defines the entry point for the DLL application.
#include "pch.h"
BOOL APIENTRY DllMain( HMODULE hModule,
DWORD ul_reason_for_call,
LPVOID lpReserved
)
{
switch (ul_reason_for_call)
{
case DLL_PROCESS_ATTACH:
case DLL_THREAD_ATTACH:
case DLL_THREAD_DETACH:
case DLL_PROCESS_DETACH:
break;
}
return TRUE;
}