mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

detect: fix/improve FreeBSD support

Browse source 
Apply patch from FreeBSD Ports.
Thanks to: Koop Mast <kwm@FreeBSD.org>, lightside <lightside@gmx.com>

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/277>
This commit is contained in:
Greg V 2020-04-02 18:56:53 +03:00 • committed by PulseAudio Marge Bot
parent f57ceec7a2
commit eccffaba26
1 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/modules/module-detect.c
View file

@ -160,11 +160,40 @@ static int detect_oss(pa_core *c, int just_one) {
continue; continue;
} else if (sscanf(line, "pcm%u: ", &device) == 1) { } 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", device);
pa_snprintf(args, sizeof(args), "device=/dev/dsp%u.0", device);
if (pa_module_load(&m, c, "module-oss", args) < 0) if (pa_module_load(&m, c, "module-oss", args) < 0)
continue; 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++; n++;