diff options
Diffstat (limited to 'audio/gnomemedia2/files/patch-ad')
| -rw-r--r-- | audio/gnomemedia2/files/patch-ad | 72 |
1 files changed, 26 insertions, 46 deletions
diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad index 3827d7a20da7..9dc4efce4c88 100644 --- a/audio/gnomemedia2/files/patch-ad +++ b/audio/gnomemedia2/files/patch-ad @@ -1,6 +1,6 @@ ---- 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 @@ +--- gmix/gmix.c.orig Tue May 7 00:43:15 2002 ++++ gmix/gmix.c Tue May 7 00:47:38 2002 +@@ -60,7 +60,7 @@ #ifdef HAVE_LINUX_SOUNDCARD_H #include <linux/soundcard.h> #else @@ -9,57 +9,37 @@ #endif #endif -@@ -499,11 +499,7 @@ +@@ -569,12 +569,7 @@ /* * open the mixer-device */ -- if (num==0) { -- sprintf(device_name, "/dev/mixer"); +- if (num == 0) { +- sprintf (device_name, "/dev/mixer"); - } else { -- sprintf(device_name, "/dev/mixer%i", num); +- 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; + new_device->fd = open (device_name, O_RDWR, 0); + + if (new_device->fd < 0) { +@@ -689,6 +684,7 @@ + + cnt = 0; + devices = NULL; ++ num_mixers = 0; + device_by_name = g_hash_table_new (g_str_hash, g_str_equal); + 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++; +@@ -697,9 +693,8 @@ + devices = g_list_append (devices, new_device); + g_hash_table_insert (device_by_name, new_device->info.name, new_device); } - } while (new_device); -- num_mixers=cnt-1; -+ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \ -+ || new_device); +- +- num_mixers = cnt - 1; ++ } while ((errno == EACCES) || (errno == EINVAL) || (errno == ENXIO) \ ++ || new_device); } - #ifdef ALSA + device_info * |