mirror of
https://git.freebsd.org/ports.git
synced 2025-06-11 07:40:40 -04:00
306fb1c9b7
- Drop --disable-xen following upstream change in 10.0 Changes: https://www.freedesktop.org/wiki/Software/PulseAudio/Notes/11.0/ ABI: https://abi-laboratory.pro/tracker/timeline/pulseaudio/ PR: 222093 Submitted by: lightside <lightside@gmx.com> MFH: 2017Q3
47 lines
1.7 KiB
C
47 lines
1.7 KiB
C
--- src/modules/module-detect.c.orig 2017-09-03 11:41:12 UTC
|
|
+++ src/modules/module-detect.c
|
|
@@ -160,11 +160,41 @@ 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_endswith(line, "default"))
|
|
continue;
|
|
+
|
|
+ const char *p = strrchr(line, '(');
|
|
+
|
|
+ if (!p)
|
|
+ continue;
|
|
+
|
|
+ if (!c->configured_default_sink && (strstr(p, "play") || (strstr(p, "p:") && !strstr(p, "(0p:")))) {
|
|
+ uint32_t idx = PA_IDXSET_INVALID;
|
|
+ pa_sink *s;
|
|
+ PA_IDXSET_FOREACH(s, c->sinks, idx) {
|
|
+ if (s->module == m) {
|
|
+ pa_core_set_configured_default_sink(c, s->name);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (!c->configured_default_source && (strstr(p, "rec") || (strstr(p, "r:") && !strstr(p, "/0r:")))) {
|
|
+ uint32_t idx = PA_IDXSET_INVALID;
|
|
+ pa_source *s;
|
|
+ PA_IDXSET_FOREACH(s, c->sources, idx) {
|
|
+ if (s->module == m) {
|
|
+ pa_core_set_configured_default_source(c, s->name);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
n++;
|