3 files changed, 6 insertions, 88 deletions

diff --git a/audio/snd/files/patch-audio_c b/audio/snd/files/patch-audio_c
deleted file mode 100644
index 7b06082a0ed6..000000000000
--- a/audio/snd/files/patch-audio_c
+++ /dev/null
@@ -1,73 +0,0 @@
---- audio.c.orig	Mon Sep 18 12:08:54 2000
-+++ audio.c	Fri Oct  6 17:34:16 2000
-@@ -1830,7 +1830,7 @@
- 	  break;
- 	}
-       if (audio_out == -1) return(error_exit(MUS_AUDIO_CANT_OPEN,audio_out));
--      if (ioctl(audio_out,SNDCTL_DSP_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-+      if (ioctl(audio_out,SOUND_PCM_READ_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-       return(audio_out);
-     }
- 
-@@ -1844,7 +1844,7 @@
- 	return error_exit(MUS_AUDIO_CANT_OPEN, audio_out); 
-       if ((ioctl(audio_out,SNDCTL_DSP_SETFMT,&oss_format) == -1) || (oss_format != to_oss_format(format))) 
- 	return(error_exit(MUS_AUDIO_FORMAT_NOT_AVAILABLE,audio_out));
--      if (ioctl(audio_out,SNDCTL_DSP_CHANNELS,&chans) == -1)
-+      if (ioctl(audio_out,SOUND_PCM_READ_CHANNELS,&chans) == -1)
- 	return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-       if (ioctl(audio_out,SNDCTL_DSP_SPEED,&srate) == -1)
- 	return(error_exit(MUS_AUDIO_SRATE_NOT_AVAILABLE,audio_out));
-@@ -1880,7 +1880,7 @@
-   if ((ioctl(audio_out,SNDCTL_DSP_SETFMT,&oss_format) == -1) || (oss_format != to_oss_format(format))) 
-     return(error_exit(MUS_AUDIO_FORMAT_NOT_AVAILABLE,audio_out));
- #ifdef NEW_OSS
--  if (ioctl(audio_out,SNDCTL_DSP_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-+  if (ioctl(audio_out,SOUND_PCM_READ_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
- #else
-   if (chans == 2) stereo = 1; else stereo = 0;
-   if ((ioctl(audio_out,SNDCTL_DSP_STEREO,&stereo) == -1) || ((chans == 2) && (stereo == 0))) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_out));
-@@ -1947,7 +1947,7 @@
- 	  break;
- 	}
-       if (audio_fd == -1) return(error_exit(MUS_AUDIO_NO_INPUT_AVAILABLE,-1));
--      if (ioctl(audio_fd,SNDCTL_DSP_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-+      if (ioctl(audio_fd,SOUND_PCM_READ_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-       return(audio_fd);
-     }
- 
-@@ -1961,7 +1961,7 @@
- 	return(error_exit(MUS_AUDIO_CANT_OPEN, audio_fd)); 
-       if ((ioctl(audio_fd,SNDCTL_DSP_SETFMT,&oss_format) == -1) || (oss_format != to_oss_format(format)))
- 	return(error_exit(MUS_AUDIO_FORMAT_NOT_AVAILABLE,audio_fd));
--      if (ioctl(audio_fd,SNDCTL_DSP_CHANNELS,&chans) == -1)
-+      if (ioctl(audio_fd,SOUND_PCM_READ_CHANNELS,&chans) == -1)
- 	return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-       if (ioctl(audio_fd,SNDCTL_DSP_SPEED,&srate) == -1)
- 	return(error_exit(MUS_AUDIO_SRATE_NOT_AVAILABLE,audio_fd));
-@@ -1992,7 +1992,6 @@
-   else 
-     {
-       err = 0;
--      err = ioctl(audio_fd,SNDCTL_DSP_SETDUPLEX,&err); /* not always a no-op! */
-       /* if (err == -1) AUDIO_ERROR = MUS_AUDIO_NO_INPUT_AVAILABLE; */
-       /* this damned thing returns -1 even when full duplex is available */
-     }
-@@ -2023,7 +2022,7 @@
-   if ((ioctl(audio_fd,SNDCTL_DSP_SETFMT,&oss_format) == -1) || (oss_format != to_oss_format(format)))
-     return(error_exit(MUS_AUDIO_FORMAT_NOT_AVAILABLE,audio_fd));
- #ifdef NEW_OSS
--  if (ioctl(audio_fd,SNDCTL_DSP_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-+  if (ioctl(audio_fd,SOUND_PCM_READ_CHANNELS,&chans) == -1) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
- #else
-   if (chans == 2) stereo = 1; else stereo = 0;
-   if ((ioctl(audio_fd,SNDCTL_DSP_STEREO,&stereo) == -1) || ((chans == 2) && (stereo == 0))) return(error_exit(MUS_AUDIO_CHANNELS_NOT_AVAILABLE,audio_fd));
-@@ -2467,7 +2466,7 @@
- 
- static char *synth_name(int i)
- {
--  if ((i>0) && (i<=SNDCARD_UART401)) 
-+  if ((i>0) && (i<=SNDCARD_NSS)) 
-     return(synth_names[i]);
-   return("unknown");
- }
diff --git a/audio/snd/files/patch-snd-gmain_c b/audio/snd/files/patch-snd-gmain_c
deleted file mode 100644
index fd7fde3a5343..000000000000
--- a/audio/snd/files/patch-snd-gmain_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- snd-gmain.c.orig	Mon Sep 18 12:09:22 2000
-+++ snd-gmain.c	Sun Oct  8 06:26:00 2000
-@@ -191,7 +191,7 @@
- #if TRAP_SEGFAULT
- #include <setjmp.h>
- /* stolen from scwm.c */
--static jmp_buf envHandleEventsLoop;
-+static sigjmp_buf envHandleEventsLoop;
- 
- static RETSIGTYPE segv(int ignored)
- {
diff --git a/audio/snd/files/patch-snd-nogui_c b/audio/snd/files/patch-snd-nogui_c
index 2642ca10ab74..a652f5b43961 100644
--- a/audio/snd/files/patch-snd-nogui_c
+++ b/audio/snd/files/patch-snd-nogui_c
@@ -1,11 +1,13 @@
---- snd-nogui.c.orig	Mon Sep 18 05:09:28 2000
-+++ snd-nogui.c	Thu Oct 19 01:09:33 2000
-@@ -230,7 +230,9 @@
+--- snd-nogui.c.old	Mon Dec  3 05:03:09 2001
++++ snd-nogui.c	Thu Jan 17 10:46:15 2002
+@@ -240,9 +240,9 @@
  char *clm2snd_help(void) {return(NULL);}
  char *read_file_data_choices(file_data *fdat, int *srate, int *chans, int *type, int *format, int *location) {return(NULL);}
  void alert_new_file(void) {}
+-
 +#if HAVE_GUILE
- void g_initialize_xgfile(snd_state *ss, SCM local_doc) {}
+ void g_initialize_xgfile(void) {}
+-
 +#endif
  snd_info *make_new_file_dialog(snd_state *ss, char *newname, int header_type, int data_format, int srate, int chans, char *comment) {return(NULL);}
  void make_cur_name_row(int old_size, int new_size) {}