summaryrefslogtreecommitdiff
path: root/audio/gnomemedia/files/patch-ad
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-07-15 19:10:59 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-07-15 19:10:59 +0000
commitcc6825cf28f45c090747ed100adeb2189bda6280 (patch)
tree227c9e7f8d44c0aaf556fd64a12ba3661c086be6 /audio/gnomemedia/files/patch-ad
parentRemove nautilus support now that Nautilus has been removed from the tree. (diff)
Begin the de-orbit burn of the GNOME 1.4 desktop. This is phase I. All
core desktop components are being removed.
Notes
Notes: svn path=/head/; revision=84934
Diffstat (limited to 'audio/gnomemedia/files/patch-ad')
-rw-r--r--audio/gnomemedia/files/patch-ad65
1 files changed, 0 insertions, 65 deletions
diff --git a/audio/gnomemedia/files/patch-ad b/audio/gnomemedia/files/patch-ad
deleted file mode 100644
index 3827d7a20da7..000000000000
--- a/audio/gnomemedia/files/patch-ad
+++ /dev/null
@@ -1,65 +0,0 @@
---- 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
- #include <linux/soundcard.h>
- #else
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- #endif
-
-@@ -499,11 +499,7 @@
- /*
- * open the mixer-device
- */
-- if (num==0) {
-- sprintf(device_name, "/dev/mixer");
-- } else {
-- sprintf(device_name, "/dev/mixer%i", num);
-- }
-+ sprintf(device_name, "/dev/mixer%i", num);
- new_device->fd=open(device_name, O_RDWR, 0);
- if (new_device->fd<0) {
- g_free(new_device);
-@@ -535,6 +531,8 @@
- }
- }
- #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=0;
-+#endif
- /*
- * several bitmasks describing the mixer
- */
-@@ -677,15 +680,16 @@
- {
- int cnt;
- device_info *new_device;
-- cnt=0; devices=NULL;
-+ cnt=0; num_mixers=0; devices=NULL;
- do {
- new_device=open_device(cnt++);
- if (new_device) {
- new_device->channels=make_channels(new_device);
- devices=g_list_append(devices, new_device);
-+ num_mixers++;
- }
-- } while (new_device);
-- num_mixers=cnt-1;
-+ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \
-+ || new_device);
- }
-
- #ifdef ALSA