Attachment 173433 Details for Bug 211684 – pulseaudio.diff

[patch] pulseaudio.diff

pulseaudio.diff (text/plain), 1.54 KB, created by Tobias Kortkamp on 2016-08-09 03:18:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2016-08-09 03:18:26 UTC

Size: 1.54 KB

patch

obsolete

>Index: files/patch-src_modules_module-detect.c
>===================================================================
>--- files/patch-src_modules_module-detect.c	(revision 419841)
>+++ files/patch-src_modules_module-detect.c	(working copy)
>@@ -10,7 +10,27 @@
>  
>  static const char* const valid_modargs[] = {
>      "just-one",
>-@@ -157,8 +159,7 @@ static int detect_oss(pa_core *c, int ju
>+@@ -130,7 +132,18 @@ static int detect_oss(pa_core *c, int ju
>+         return -1;
>+     }
>+ 
>+-    while (!feof(f)) {
>++    /* On FreeBSD we load an OSS module instance first that uses the
>++     * default audio device /dev/dsp before all the others.  This way
>++     * PulseAudio defaults to using it instead of /dev/dsp0 i.e. it
>++     * actually respect the default sound unit set with sysctl
>++     * hw.snd.default_unit.  The default device will appear again in
>++     * /dev/sndstat and thus will be duplicated in PulseAudio but that
>++     * should not matter much for the benefit gained (a sane default
>++     * user experience). */
>++    pa_module_load(c, "module-oss", "device=/dev/dsp");
>++    n++;
>++
>++    while (!just_one && !feof(f)) {
>+         char line[256], args[64];
>+         unsigned device;
>+ 
>+@@ -157,17 +170,13 @@ static int detect_oss(pa_core *c, int ju
>                  continue;
>  
>          } else if (sscanf(line, "pcm%u: ", &device) == 1) {
>@@ -20,3 +40,12 @@
>  
>              if (!pa_module_load(c, "module-oss", args))
>                  continue;
>+         }
>+ 
>+         n++;
>+-
>+-        if (just_one)
>+-            break;
>+     }
>+ 
>+     fclose(f);

Actions: View | Diff

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