From 42ea1c8ecf079087ba6101a42995b64106a63a8f Mon Sep 17 00:00:00 2001 From: Michael Maltese Date: Sun, 25 Jun 2017 23:17:56 -0700 Subject: OpenAL: remove aldlist.cpp --- Source/Core/AudioCommon/OpenALStream.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'Source/Core/AudioCommon/OpenALStream.cpp') diff --git a/Source/Core/AudioCommon/OpenALStream.cpp b/Source/Core/AudioCommon/OpenALStream.cpp index 753a925288..ffb0bf93dd 100644 --- a/Source/Core/AudioCommon/OpenALStream.cpp +++ b/Source/Core/AudioCommon/OpenALStream.cpp @@ -9,7 +9,6 @@ #include #include "AudioCommon/OpenALStream.h" -#include "AudioCommon/aldlist.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/Thread.h" @@ -24,21 +23,19 @@ // bool OpenALStream::Start() { - ALDeviceList pDeviceList; - if (!pDeviceList.GetNumDevices()) + if (!alcIsExtensionPresent(nullptr, "ALC_ENUMERATION_EXT")) { PanicAlertT("OpenAL: can't find sound devices"); return false; } - char* defDevName = pDeviceList.GetDeviceName(pDeviceList.GetDefaultDevice()); + const char* defaultDeviceName = alcGetString(nullptr, ALC_DEFAULT_DEVICE_SPECIFIER); + INFO_LOG(AUDIO, "Found OpenAL device %s", defaultDeviceName); - INFO_LOG(AUDIO, "Found OpenAL device %s", defDevName); - - ALCdevice* pDevice = alcOpenDevice(defDevName); + ALCdevice* pDevice = alcOpenDevice(defaultDeviceName); if (!pDevice) { - PanicAlertT("OpenAL: can't open device %s", defDevName); + PanicAlertT("OpenAL: can't open device %s", defaultDeviceName); return false; } @@ -46,7 +43,7 @@ bool OpenALStream::Start() if (!pContext) { alcCloseDevice(pDevice); - PanicAlertT("OpenAL: can't create context for device %s", defDevName); + PanicAlertT("OpenAL: can't create context for device %s", defaultDeviceName); return false; } -- cgit v1.2.3