summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhe <he>1999-05-15 18:50:58 +0000
committerhe <he>1999-05-15 18:50:58 +0000
commit8f9063e6108f19ff6135fc9d975bd94bbf4873c2 (patch)
tree9589edb84b20a25eb09d7e0c25acc8c23076b4da
parent240b0b130876015e6899f13dfd27abd69741f867 (diff)
downloadpkgsrc-8f9063e6108f19ff6135fc9d975bd94bbf4873c2.tar.gz
Don't skip "record" mixer devices on NetBSD, so that the volume
control can stand a bigger chance of working on NetBSD. Tested with wss0 chip on i386, where the 'pcm' mixer (sub)device is the one which should be tweaked for volume control through libossaudio.
-rw-r--r--audio/gqmpeg/patches/patch-ab25
1 files changed, 16 insertions, 9 deletions
diff --git a/audio/gqmpeg/patches/patch-ab b/audio/gqmpeg/patches/patch-ab
index f18ba9ef7cd..f8bb7876b6e 100644
--- a/audio/gqmpeg/patches/patch-ab
+++ b/audio/gqmpeg/patches/patch-ab
@@ -1,9 +1,8 @@
-$NetBSD: patch-ab,v 1.2 1999/05/15 03:49:14 hubertf Exp $
+$NetBSD: patch-ab,v 1.3 1999/05/15 18:50:58 he Exp $
---- mixer.c.orig Thu May 6 20:04:04 1999
-+++ mixer.c Thu May 6 20:10:47 1999
-@@ -32,6 +32,11 @@
- #include <machine/soundcard.h>
+--- mixer.c.orig Sat Mar 27 13:38:09 1999
++++ mixer.c Sat May 15 20:19:54 1999
+@@ -33,4 +33,9 @@
#endif
+#ifdef __NetBSD__
@@ -13,13 +12,21 @@ $NetBSD: patch-ab,v 1.2 1999/05/15 03:49:14 hubertf Exp $
+
#define LEFT 1
#define RIGHT 256
- #define LEFT_MASK 0x00ff
-@@ -55,7 +60,7 @@
- static GList *device_list = NULL;
+@@ -56,5 +61,5 @@
static DeviceData *current_device = NULL;
-#if defined (linux) || defined (__FreeBSD__)
+#if defined (linux) || defined (__FreeBSD__) || defined (__NetBSD__)
void mixer_init(gint init_device_id)
{
- char *device_names[] = SOUND_DEVICE_NAMES;
+@@ -91,5 +96,9 @@
+ for (i=0; i<SOUND_MIXER_NRDEVICES; i++)
+ {
+- if ((dev_mask & (1<<i)) && !(rec_mask & (1<<i))) /* skip unsupported & record devs */
++ if ((dev_mask & (1<<i)) /* skip unsupported */
++#ifndef __NetBSD__
++ && !(rec_mask & (1<<i)) /* & record devs */
++#endif
++ )
+ {
+ DeviceData *device = g_new0(DeviceData, 1);