summaryrefslogtreecommitdiff
path: root/audio/pulseaudio/files/patch-src_modules_module-detect.c
diff options
context:
space:
mode:
Diffstat (limited to 'audio/pulseaudio/files/patch-src_modules_module-detect.c')
-rw-r--r--audio/pulseaudio/files/patch-src_modules_module-detect.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/audio/pulseaudio/files/patch-src_modules_module-detect.c b/audio/pulseaudio/files/patch-src_modules_module-detect.c
index fb440f731c2f..4f2410eec61c 100644
--- a/audio/pulseaudio/files/patch-src_modules_module-detect.c
+++ b/audio/pulseaudio/files/patch-src_modules_module-detect.c
@@ -1,20 +1,18 @@
---- src/modules/module-detect.c.orig 2017-09-03 11:41:12 UTC
+--- src/modules/module-detect.c.orig 2018-05-11 11:43:30 UTC
+++ src/modules/module-detect.c
-@@ -160,11 +160,41 @@ static int detect_oss(pa_core *c, int ju
+@@ -160,11 +160,40 @@ static int detect_oss(pa_core *c, int ju
continue;
} else if (sscanf(line, "pcm%u: ", &device) == 1) {
- /* FreeBSD support, the devices are named /dev/dsp0.0, dsp0.1 and so on */
- pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);
+ pa_snprintf(args, sizeof(args), "device=/dev/dsp%u", device);
-+ pa_module *m = pa_module_load(c, "module-oss", args);
-- if (!pa_module_load(c, "module-oss", args))
-+ if (!m)
-+ continue;
+ if (pa_module_load(&m, c, "module-oss", args) < 0)
+ continue;
+
+ if (!pa_endswith(line, "default"))
- continue;
++ continue;
+
+ const char *p = strrchr(line, '(');
+