[PATCH 16/16] mmdevapi: Add pulseaudio to ignore list on older openal versions
Maarten Lankhorst
m.b.lankhorst at gmail.com
Wed Apr 14 14:18:42 CDT 2010
---
dlls/mmdevapi/devenum.c | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c
index 50ceefe..365a32f 100644
--- a/dlls/mmdevapi/devenum.c
+++ b/dlls/mmdevapi/devenum.c
@@ -745,16 +745,34 @@ static void openal_setformat(MMDevice *This, DWORD freq)
}
}
+static int blacklist_pulse;
+
static int blacklist(const char *dev) {
#ifdef __linux__
if (strncmp(dev, "OSS ", 4))
return 1;
#endif
+ if (blacklist_pulse && !strncmp(dev, "PulseAudio ", 11))
+ return 1;
if (strstr(dev, "ALSA") && strstr(dev, "hw:"))
return 1;
return 0;
}
+static void boycott_pulse(const char *devstr, const char **defstr) {
+ if (!blacklist_pulse && !local_contexts) {
+ WARN("Disabling pulseaudio because of old openal version\n");
+ blacklist_pulse = 1;
+ }
+ if (!blacklist_pulse || !devstr || strncmp(*defstr, "PulseAudio ", 11))
+ return;
+ while (*devstr && !strncmp(devstr, "PulseAudio ", 11)) {
+ devstr += strlen(devstr) + 1;
+ }
+ TRACE("New default: %s\n", devstr);
+ *defstr = devstr;
+}
+
static void openal_scanrender(void)
{
WCHAR name[MAX_PATH];
@@ -769,6 +787,7 @@ static void openal_scanrender(void)
defaultstr = palcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
devstr = palcGetString(NULL, ALC_DEVICE_SPECIFIER);
}
+ boycott_pulse(devstr, &defaultstr);
defblacklisted = blacklist(defaultstr);
if (defblacklisted)
WARN("Disabling blacklist because %s is blacklisted\n", defaultstr);
@@ -809,6 +828,7 @@ static void openal_scancapture(void)
EnterCriticalSection(&openal_crst);
devstr = palcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
defaultstr = palcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER);
+ boycott_pulse(devstr, &defaultstr);
defblacklisted = blacklist(defaultstr);
if (defblacklisted)
WARN("Disabling blacklist because %s is blacklisted\n", defaultstr);
--
1.7.0
--------------030307060706010103080303--
More information about the wine-patches
mailing list