$NetBSD: patch-ac,v 1.4 2002/07/26 09:17:06 rh Exp $ --- gmix/gmix.c.orig Mon Jun 11 19:50:47 2001 +++ gmix/gmix.c @@ -55,7 +55,9 @@ #ifdef ALSA #include #else -#ifdef HAVE_LINUX_SOUNDCARD_H +#ifdef HAVE_SOUNDCARD_H +#include +#elif defined(HAVE_LINUX_SOUNDCARD_H) #include #else #include @@ -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