Attachment 173511 Details for Bug 211684 – Proposed patch (since 419133 revision) for v8.0

[patch] Proposed patch (since 419133 revision) for v8.0

pulseaudio_8.0.diff (text/plain), 2.38 KB, created by lightside on 2016-08-10 14:25:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-08-10 14:25:22 UTC

Size: 2.38 KB

patch

obsolete

>--- pulseaudio.orig/files/patch-src_modules_module-detect.c	2016-07-26 16:51:15 UTC
>+++ pulseaudio/files/patch-src_modules_module-detect.c
>@@ -10,13 +10,56 @@
>  
>  static const char* const valid_modargs[] = {
>      "just-one",
>-@@ -157,8 +159,7 @@ static int detect_oss(pa_core *c, int ju
>+@@ -157,11 +159,49 @@ 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);
>++            int is_sink = 0, is_source = 0;
>++            if (pa_endswith(line, "default")) {
>++                const char *p = strstr(line, "> (");
>++                if (p) {
>++                    if (strstr(p, "play"))
>++                        is_sink = 1;
>  
>-             if (!pa_module_load(c, "module-oss", args))
>+-            if (!pa_module_load(c, "module-oss", args))
>++                    if (strstr(p, "rec"))
>++                        is_source = 1;
>++                }
>++            }
>++
>++            pa_snprintf(args, sizeof(args), "device=/dev/dsp%u", device);
>++            pa_module *m = pa_module_load(c, "module-oss", args);
>++
>++            if (!m)
>                  continue;
>++
>++            if (!c->default_sink && is_sink) {
>++                uint32_t idx = PA_IDXSET_INVALID;
>++                pa_sink *s;
>++                PA_IDXSET_FOREACH(s, c->sinks, idx) {
>++                    if (s->module == m) {
>++                        if (!pa_namereg_set_default_sink(c, s))
>++                            pa_log_error("failed to set default sink for device: /dev/dsp%u", device);
>++
>++                        break;
>++                    }
>++                }
>++            }
>++
>++            if (!c->default_source && is_source) {
>++                uint32_t idx = PA_IDXSET_INVALID;
>++                pa_source *s;
>++                PA_IDXSET_FOREACH(s, c->sources, idx) {
>++                    if (s->module == m) {
>++                        if (!pa_namereg_set_default_source(c, s))
>++                            pa_log_error("failed to set default source for device: /dev/dsp%u", device);
>++
>++                        break;
>++                    }
>++                }
>++            }
>+         }
>+ 
>+         n++;

Actions: View | Diff

Attachments on bug 211684: 173433 | 173479 | 173511 | 173513 | 173514 | 173515 | 173625 | 173626 | 173915 | 175354 | 176133 | 176143 | 176830 | 176833