summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorwiz <wiz>2000-08-26 16:41:49 +0000
committerwiz <wiz>2000-08-26 16:41:49 +0000
commita146cfef866932dc1cd9734076e8eb301ec2b65e (patch)
tree0c047e28e64995781ae5aaa3cfb557aac5e9e1e7 /audio
parent7daee780be964da803544e8fe7ae5d29b2201c47 (diff)
downloadpkgsrc-a146cfef866932dc1cd9734076e8eb301ec2b65e.tar.gz
Bugfix: Make choosing `outputs.line' as volume control device
possible, even if `inputs.line' also exists and comes earlier (both were noted only as `line' before).
Diffstat (limited to 'audio')
-rw-r--r--audio/gqmpeg/files/patch-sum3
-rw-r--r--audio/gqmpeg/patches/patch-ab33
2 files changed, 35 insertions, 1 deletions
diff --git a/audio/gqmpeg/files/patch-sum b/audio/gqmpeg/files/patch-sum
index 56d6902446b..a0638c0de82 100644
--- a/audio/gqmpeg/files/patch-sum
+++ b/audio/gqmpeg/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/08/02 06:06:14 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/08/26 16:41:50 wiz Exp $
MD5 (patch-aa) = f276e6a2f0270b78b8ae8c6bff0dcfa5
+MD5 (patch-ab) = b2ace351a9aa9c89bd3b03a417897b5d
diff --git a/audio/gqmpeg/patches/patch-ab b/audio/gqmpeg/patches/patch-ab
new file mode 100644
index 00000000000..2f360ef4593
--- /dev/null
+++ b/audio/gqmpeg/patches/patch-ab
@@ -0,0 +1,33 @@
+$NetBSD: patch-ab,v 1.11 2000/08/26 16:41:49 wiz Exp $
+
+--- src/mixer.c.orig Mon Jul 24 00:25:50 2000
++++ src/mixer.c
+@@ -265,6 +265,17 @@
+ mixer_devinfo_t *infos;
+ mixer_ctrl_t *values;
+
++char *
++catstr(char *p, char *q)
++{
++ char *r = malloc(strlen(p) + strlen(q) + 2);
++ strcpy(r, p);
++ strcat(r, ".");
++ strcat(r, q);
++ return r;
++}
++
++
+ void mixer_init(gint init_device_id)
+ {
+ int fd, i, ndev;
+@@ -306,7 +317,9 @@
+ if (infos[i].type == AUDIO_MIXER_VALUE) {
+ DeviceData *device = g_new0(DeviceData, 1);
+ device->device_id = i;
+- device->device_name = infos[i].label.name;
++ device->device_name =
++ catstr(infos[infos[i].mixer_class].label.name,
++ infos[i].label.name);
+ device->stereo = 1;
+ device->recordable = 0;
+ device_list = g_list_append(device_list, device);