sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc: Remove last remnants of UWP

Browse Source
This commit is contained in:
Connor McLaughlin
2022-11-03 13:12:46 +10:00
parent 438f085cfe
commit 97ff2bf000
5 changed files with 2 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontend-common/xaudio2_audio_stream.cpp
View File

@ -43,17 +43,13 @@ bool XAudio2AudioStream::OpenDevice(u32 latency_ms)
{
DebugAssert(!IsOpen());
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
m_xaudio2_library = LoadLibraryW(XAUDIO2_DLL_W);
if (!m_xaudio2_library)
{
Log_ErrorPrintf("Failed to load '%s', make sure you're using Windows 10", XAUDIO2_DLL_A);
return false;
}
#endif
HRESULT hr;
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
using PFNXAUDIO2CREATE =
HRESULT(STDAPICALLTYPE*)(IXAudio2 * *ppXAudio2, UINT32 Flags, XAUDIO2_PROCESSOR XAudio2Processor);
PFNXAUDIO2CREATE xaudio2_create =
@ -61,7 +57,7 @@ bool XAudio2AudioStream::OpenDevice(u32 latency_ms)
if (!xaudio2_create)
return false;
hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
HRESULT hr = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
m_com_initialized_by_us = SUCCEEDED(hr);
if (FAILED(hr) && hr != RPC_E_CHANGED_MODE && hr != S_FALSE)
{
@ -70,9 +66,6 @@ bool XAudio2AudioStream::OpenDevice(u32 latency_ms)
}
hr = xaudio2_create(m_xaudio.ReleaseAndGetAddressOf(), 0, XAUDIO2_DEFAULT_PROCESSOR);
#else
hr = XAudio2Create(m_xaudio.ReleaseAndGetAddressOf(), 0, XAUDIO2_DEFAULT_PROCESSOR);
#endif
if (FAILED(hr))
{
Log_ErrorPrintf("XAudio2Create() failed: %08X", hr);