aboutsummaryrefslogtreecommitdiff
path: root/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
diff options
context:
space:
mode:
Diffstat (limited to 'audio/pulseaudio/files/patch-src_modules_oss_module-oss.c')
-rw-r--r--audio/pulseaudio/files/patch-src_modules_oss_module-oss.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
index 4edcb6627c96..e7b600cb3bf1 100644
--- a/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
+++ b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c
@@ -1,6 +1,6 @@
---- src/modules/oss/module-oss.c.orig 2014-01-23 19:57:55.000000000 +0100
-+++ src/modules/oss/module-oss.c 2014-03-22 10:59:05.000000000 +0100
-@@ -1229,10 +1229,14 @@ int pa__init(pa_module*m) {
+--- src/modules/oss/module-oss.c.orig 2015-08-06 11:39:12.000000000 +0200
++++ src/modules/oss/module-oss.c 2015-09-03 13:13:37.953255000 +0200
+@@ -1227,10 +1227,14 @@
use_mmap = false;
}
@@ -15,12 +15,3 @@
if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0)
pa_log_info("Hardware name is '%s'.", hwdesc);
-@@ -1428,7 +1432,7 @@ int pa__init(pa_module*m) {
- if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) {
- bool do_close = true;
-
-- if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
-+ if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0)
- pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno));
- else {
- if (u->sink && (u->mixer_devmask & (SOUND_MASK_VOLUME|SOUND_MASK_PCM))) {