|
@@ -56,7 +56,7 @@ ALDeviceList::ALDeviceList( const OPENALFNTABLE &oalft )
|
|
|
|
|
|
// grab function pointers for 1.0-API functions, and if successful proceed to enumerate all devices
|
|
// grab function pointers for 1.0-API functions, and if successful proceed to enumerate all devices
|
|
if (ALFunction.alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT")) {
|
|
if (ALFunction.alcIsExtensionPresent(NULL, "ALC_ENUMERATION_EXT")) {
|
|
- devices = (char *)ALFunction.alcGetString(NULL, ALC_DEVICE_SPECIFIER);
|
|
|
|
|
|
+ devices = (char *)ALFunction.alcGetString(NULL, ALC_ALL_DEVICES_SPECIFIER);
|
|
defaultDeviceName = (char *)ALFunction.alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
|
|
defaultDeviceName = (char *)ALFunction.alcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
|
|
index = 0;
|
|
index = 0;
|
|
// go through device list (each device terminated with a single NULL, list terminated with double NULL)
|
|
// go through device list (each device terminated with a single NULL, list terminated with double NULL)
|
|
@@ -70,7 +70,7 @@ ALDeviceList::ALDeviceList( const OPENALFNTABLE &oalft )
|
|
if (context) {
|
|
if (context) {
|
|
ALFunction.alcMakeContextCurrent(context);
|
|
ALFunction.alcMakeContextCurrent(context);
|
|
// if new actual device name isn't already in the list, then add it...
|
|
// if new actual device name isn't already in the list, then add it...
|
|
- actualDeviceName = ALFunction.alcGetString(device, ALC_DEVICE_SPECIFIER);
|
|
|
|
|
|
+ actualDeviceName = devices;
|
|
bool bNewName = true;
|
|
bool bNewName = true;
|
|
for (int i = 0; i < GetNumDevices(); i++) {
|
|
for (int i = 0; i < GetNumDevices(); i++) {
|
|
if (String::compare(GetDeviceName(i), actualDeviceName) == 0) {
|
|
if (String::compare(GetDeviceName(i), actualDeviceName) == 0) {
|
|
@@ -313,4 +313,4 @@ unsigned int ALDeviceList::GetMaxNumSources()
|
|
}
|
|
}
|
|
|
|
|
|
return iSourceCount;
|
|
return iSourceCount;
|
|
-}
|
|
|
|
|
|
+}
|