From aea615edb3c78323c0c53dad5ea5514436a48b75 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 4 Aug 2010 05:07:56 -0700 Subject: [PATCH] Prevent re-probing while opening a Pulse device if no devices were found --- Alc/pulseaudio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Alc/pulseaudio.c b/Alc/pulseaudio.c index 8401b715..e647ac5c 100644 --- a/Alc/pulseaudio.c +++ b/Alc/pulseaudio.c @@ -666,6 +666,11 @@ static void probe_devices(ALboolean capture) { pa_threaded_mainloop *loop; + if(capture == AL_FALSE) + allDevNameMap = malloc(sizeof(DevMap) * 1); + else + allCaptureDevNameMap = malloc(sizeof(DevMap) * 1); + if((loop=ppa_threaded_mainloop_new()) && ppa_threaded_mainloop_start(loop) >= 0) { @@ -679,7 +684,6 @@ static void probe_devices(ALboolean capture) if(capture == AL_FALSE) { - allDevNameMap = malloc(sizeof(DevMap) * 1); allDevNameMap[0].name = strdup(pulse_device); allDevNameMap[0].device_name = NULL; numDevNames = 1; @@ -688,7 +692,6 @@ static void probe_devices(ALboolean capture) } else { - allCaptureDevNameMap = malloc(sizeof(DevMap) * 1); allCaptureDevNameMap[0].name = strdup(pulse_device); allCaptureDevNameMap[0].device_name = NULL; numCaptureDevNames = 1;