Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass the appropriate BackendInfo explicitly to ProbeDevices

Browse Source
This commit is contained in:
Chris Robinson
2015-10-28 18:10:12 -07:00
parent 59c6fc966d
commit bd73cdab0d
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/ALc.c
+9 -21
View File
@@ -1223,39 +1223,27 @@ static void alc_deinit(void)
/************************************************
* Device enumeration
************************************************/
static void ProbeDevices(al_string *list, enum DevProbe type)
static void ProbeDevices(al_string *list, struct BackendInfo *backendinfo, enum DevProbe type)
{
DO_INITCONFIG();
LockLists();
al_string_clear(list);
if(type == ALL_DEVICE_PROBE && (PlaybackBackend.Probe || PlaybackBackend.getFactory))
if(!backendinfo->getFactory)
backendinfo->Probe(type);
else
{
if(!PlaybackBackend.getFactory)
PlaybackBackend.Probe(type);
else
{
ALCbackendFactory *factory = PlaybackBackend.getFactory();
V(factory,probe)(type);
}
}
else if(type == CAPTURE_DEVICE_PROBE && (CaptureBackend.Probe || CaptureBackend.getFactory))
{
if(!CaptureBackend.getFactory)
CaptureBackend.Probe(type);
else
{
ALCbackendFactory *factory = CaptureBackend.getFactory();
V(factory,probe)(type);
}
ALCbackendFactory *factory = backendinfo->getFactory();
V(factory,probe)(type);
}
UnlockLists();
}
static void ProbeAllDevicesList(void)
{ ProbeDevices(&alcAllDevicesList, ALL_DEVICE_PROBE); }
{ ProbeDevices(&alcAllDevicesList, &PlaybackBackend, ALL_DEVICE_PROBE); }
static void ProbeCaptureDeviceList(void)
{ ProbeDevices(&alcCaptureDeviceList, CAPTURE_DEVICE_PROBE); }
{ ProbeDevices(&alcCaptureDeviceList, &CaptureBackend, CAPTURE_DEVICE_PROBE); }
static void AppendDevice(const ALCchar *name, al_string *devnames)
{