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

Don't enumerate "PulseAudio Default" in the ALL_DEVICES list

Browse Source
This commit is contained in:
Chris Robinson 2011-08-20 03:00:38 -07:00
parent 529ff3197a
commit 80b8abb0ec
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Alc/backends/pulseaudio.c
View File

@ -757,21 +757,9 @@ static void probe_devices(ALboolean capture)
pa_operation *o; pa_operation *o;
if(capture == AL_FALSE) if(capture == AL_FALSE)
{
allDevNameMap[0].name = strdup(pulse_device);
allDevNameMap[0].device_name = NULL;
numDevNames = 1;
o = pa_context_get_sink_info_list(context, sink_device_callback, loop); o = pa_context_get_sink_info_list(context, sink_device_callback, loop);
}
else else
{
allCaptureDevNameMap[0].name = strdup(pulse_device);
allCaptureDevNameMap[0].device_name = NULL;
numCaptureDevNames = 1;
o = pa_context_get_source_info_list(context, source_device_callback, loop); o = pa_context_get_source_info_list(context, source_device_callback, loop);
}
while(pa_operation_get_state(o) == PA_OPERATION_RUNNING) while(pa_operation_get_state(o) == PA_OPERATION_RUNNING)
pa_threaded_mainloop_wait(loop); pa_threaded_mainloop_wait(loop);
pa_operation_unref(o); pa_operation_unref(o);
@ -869,9 +857,9 @@ static ALCboolean pulse_open_playback(ALCdevice *device, const ALCchar *device_n
if(!allDevNameMap) if(!allDevNameMap)
probe_devices(AL_FALSE); probe_devices(AL_FALSE);
if(!device_name && numDevNames > 0) if(!device_name)
device_name = allDevNameMap[0].name; device_name = pulse_device;
else else if(strcmp(device_name, pulse_device) != 0)
{ {
ALuint i; ALuint i;
@ -1108,9 +1096,9 @@ static ALCboolean pulse_open_capture(ALCdevice *device, const ALCchar *device_na
if(!allCaptureDevNameMap) if(!allCaptureDevNameMap)
probe_devices(AL_TRUE); probe_devices(AL_TRUE);
if(!device_name && numCaptureDevNames > 0) if(!device_name)
device_name = allCaptureDevNameMap[0].name; device_name = pulse_device;
else else if(strcmp(device_name, pulse_device) != 0)
{ {
ALuint i; ALuint i;