From owner-freebsd-gnome Sun Apr 7 8:57:51 2002 Delivered-To: freebsd-gnome@freebsd.org Received: from creme-brulee.marcuscom.com (rdu57-17-158.nc.rr.com [66.57.17.158]) by hub.freebsd.org (Postfix) with ESMTP id AE38237B404; Sun, 7 Apr 2002 08:57:45 -0700 (PDT) Received: from shumai.marcuscom.com (shumai.marcuscom.com [192.168.1.4]) by creme-brulee.marcuscom.com (8.11.6/8.11.6) with ESMTP id g37Fu4v11185; Sun, 7 Apr 2002 11:56:04 -0400 (EDT) (envelope-from marcus@marcuscom.com) Subject: Re: audio/gnomemedia fails to build on -CURRENT From: Joe Marcus Clarke To: Maxim Sobolev Cc: Anders Andersson , gnome@FreeBSD.org In-Reply-To: <200204070842.g378gF840668@vega.vega.com> References: <200204070842.g378gF840668@vega.vega.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-kzafQxVIcRMf1gbZuE1Q" X-Mailer: Ximian Evolution 1.0.3 Date: 07 Apr 2002 12:57:58 -0300 Message-Id: <1018195078.11209.3.camel@shumai.marcuscom.com> Mime-Version: 1.0 Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-kzafQxVIcRMf1gbZuE1Q Content-Type: multipart/mixed; boundary="=-5XKpohkIRbEOY3U1lWGr" --=-5XKpohkIRbEOY3U1lWGr Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Sun, 2002-04-07 at 05:42, Maxim Sobolev wrote: > No patch is attached. :((( >=20 > Please resend. >=20 > -Maxim Sorry. It's attached now. Joe >=20 --=-5XKpohkIRbEOY3U1lWGr Content-Disposition: attachment; filename=patch-ad Content-Type: text/plain; name=patch-ad; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable --- gmix/gmix.c.orig Mon Jun 11 13:50:47 2001 +++ gmix/gmix.c Sat Apr 6 14:55:36 2002 @@ -58,7 +58,7 @@ #ifdef HAVE_LINUX_SOUNDCARD_H=20 #include #else=20 -#include +#include #endif #endif =20 @@ -499,11 +499,7 @@ /* * open the mixer-device */ - if (num=3D=3D0) { - sprintf(device_name, "/dev/mixer"); - } else { - sprintf(device_name, "/dev/mixer%i", num); - } + sprintf(device_name, "/dev/mixer%i", num); new_device->fd=3Dopen(device_name, O_RDWR, 0); if (new_device->fd<0) { g_free(new_device); @@ -535,6 +531,8 @@ } =09 } #endif + +#if defined(OPEN_SOUND_SYSTEM) /* * mixer-name */ @@ -545,6 +543,11 @@ } if(!isalpha(new_device->info.name[0])) g_snprintf(new_device->info.name, 31, "Card %d", num+1); +#else + g_snprintf(new_device->info.id, 15, "mixer%d", num); + g_snprintf(new_device->info.name, 31, "Sound Card %d", num+1); + new_device->info.modify_counter=3D0; +#endif /*=20 * several bitmasks describing the mixer */ @@ -677,15 +680,16 @@ { int cnt; device_info *new_device; - cnt=3D0; devices=3DNULL; + cnt=3D0; num_mixers=3D0; devices=3DNULL; do { new_device=3Dopen_device(cnt++); if (new_device) { new_device->channels=3Dmake_channels(new_device); devices=3Dg_list_append(devices, new_device); + num_mixers++; } - } while (new_device); - num_mixers=3Dcnt-1; + } while ((errno =3D=3D EACCES) || (errno =3D=3D EINVAL) || (errno =3D=3D = ENXIO) \ + || new_device); } =20 #ifdef ALSA --=-5XKpohkIRbEOY3U1lWGr-- --=-kzafQxVIcRMf1gbZuE1Q Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (FreeBSD) Comment: For info see http://www.gnupg.org iEYEABECAAYFAjywbIYACgkQb2iPiv4Uz4drdwCeKDa0IXYR1Oh1czSNR2MOFXQs rRkAoJjAgg8VHzdTiaVCFwPJ9DtQgyVI =g4i7 -----END PGP SIGNATURE----- --=-kzafQxVIcRMf1gbZuE1Q-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message