summaryrefslogtreecommitdiff
path: root/multimedia/gnome-media/patches/patch-ac
blob: 06db03b19e2b730d48e31533184a622216267064 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
$NetBSD: patch-ac,v 1.1.1.1 2004/02/22 16:31:00 jmmv Exp $

--- gmix/gmix.c.orig	Mon Jun 11 19:50:47 2001
+++ gmix/gmix.c
@@ -55,7 +55,9 @@
 #ifdef ALSA
 #include <sys/asoundlib.h>
 #else
-#ifdef HAVE_LINUX_SOUNDCARD_H 
+#ifdef HAVE_SOUNDCARD_H
+#include <soundcard.h>
+#elif defined(HAVE_LINUX_SOUNDCARD_H)
 #include <linux/soundcard.h>
 #else 
 #include <machine/soundcard.h>
@@ -538,12 +547,16 @@
 	/*
 	 * mixer-name
 	 */
+#ifdef HAVE_MIXER_INFO
 	res=ioctl(new_device->fd, SOUND_MIXER_INFO, &new_device->info);
 	if (res!=0) {
 		g_free(new_device);
 		return NULL;
 	}
 	if(!isalpha(new_device->info.name[0]))
+#else
+	g_snprintf(new_device->info.id, 31, "%d", num+1);
+#endif
 		g_snprintf(new_device->info.name, 31, "Card %d", num+1);
 	/* 
 	 * several bitmasks describing the mixer