X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=e635c846799f4dec40d0cc4d1a4686036b3b812d;hp=29d5a981f3d2836356d397f7160a2e49da7bb482;hb=9a7426789c04bf396df78eb915522f9e57af985e;hpb=5eeeb4703415b1fbad7910c2a3bf2c5af13916f8

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 29d5a981..e635c846 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -21,75 +21,107 @@
 #include "system.h"
 #include "sound.h"
 #include "misc.h"
+#include "setup.h"
 
 
+struct ListNode
+{
+  char *key;
+  void *content;
+  struct ListNode *next;
+};
+typedef struct ListNode ListNode;
+
+static ListNode *newListNode(void);
+static void addNodeToList(ListNode **, char *, void *);
+static void deleteNodeFromList(ListNode **, char *, void (*function)(void *));
+static ListNode *getNodeFromKey(ListNode *, char *);
+static int getNumNodes(ListNode *);
+
+
+static struct SoundEffectInfo *sound_effect;
+static ListNode *SoundFileList = NULL;
+static SoundInfo **Sound = NULL;
+static MusicInfo **Music = NULL;
 static int num_sounds = 0, num_music = 0;
-static struct SampleInfo *Sound = NULL;
-#if defined(TARGET_SDL)
-static int num_mods = 0;
-static struct SampleInfo *Mod = NULL;
-#endif
 
 
 /* ========================================================================= */
 /* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS            */
 
+static struct AudioFormatInfo afmt =
+{
+  TRUE, 0, DEFAULT_AUDIO_SAMPLE_RATE, DEFAULT_AUDIO_FRAGMENT_SIZE
+};
+
 static int playing_sounds = 0;
-static struct SoundControl playlist[MAX_SOUNDS_PLAYING];
+static struct SoundControl playlist[NUM_MIXER_CHANNELS];
 static struct SoundControl emptySoundControl =
 {
-  -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL
+#if 1
+  FALSE, -1, 0, 0, FALSE, 0, 0, 0, NULL
+#else
+  -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0, 0,NULL
+#endif
 };
 
 #if defined(PLATFORM_UNIX)
-static int stereo_volume[PSND_MAX_LEFT2RIGHT+1];
-static char premix_first_buffer[SND_BLOCKSIZE];
+static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1];
+static short premix_first_buffer[SND_BLOCKSIZE];
 #if defined(AUDIO_STREAMING_DSP)
-static char premix_left_buffer[SND_BLOCKSIZE];
-static char premix_right_buffer[SND_BLOCKSIZE];
-static int premix_last_buffer[SND_BLOCKSIZE];
+static short premix_left_buffer[SND_BLOCKSIZE];
+static short premix_right_buffer[SND_BLOCKSIZE];
+static long premix_last_buffer[SND_BLOCKSIZE];
 #endif
-static unsigned char playing_buffer[SND_BLOCKSIZE];
+static byte playing_buffer[SND_BLOCKSIZE];
 #endif
 
 /* forward declaration of internal functions */
 #if defined(AUDIO_STREAMING_DSP)
 static void SoundServer_InsertNewSound(struct SoundControl);
+static void InitAudioDevice_DSP(struct AudioFormatInfo *);
+#elif defined(PLATFORM_HPUX)
+static void InitAudioDevice_HPUX(struct AudioFormatInfo *);
 #elif defined(PLATFORM_UNIX)
 static unsigned char linear_to_ulaw(int);
 static int ulaw_to_linear(unsigned char);
-#endif
-
-#if defined(AUDIO_LINUX_IOCTL)
-static boolean InitAudioDevice_Linux();
-#elif defined(PLATFORM_NETBSD)
-static boolean InitAudioDevice_NetBSD();
-#elif defined(PLATFORM_HPUX)
-static boolean InitAudioDevice_HPUX();
 #elif defined(PLATFORM_MSDOS)
 static void SoundServer_InsertNewSound(struct SoundControl);
-static void SoundServer_StopSound(int);
+static void SoundServer_StopSound(struct SoundControl);
 static void SoundServer_StopAllSounds();
 #endif
 
+static void ReloadCustomSounds();
+static void ReloadCustomMusic();
+static void FreeSound(void *);
+
 #if defined(PLATFORM_UNIX)
 static int OpenAudioDevice(char *audio_device_name)
 {
-  int audio_fd;
+  int audio_device_fd;
 
   /* check if desired audio device is accessible */
   if (access(audio_device_name, W_OK) != 0)
     return -1;
 
   /* try to open audio device in non-blocking mode */
-  if ((audio_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0)
-    return audio_fd;
+  if ((audio_device_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0)
+    return audio_device_fd;
 
   /* re-open audio device in blocking mode */
-  close(audio_fd);
-  audio_fd = open(audio_device_name, O_WRONLY);
+  close(audio_device_fd);
+  audio_device_fd = open(audio_device_name, O_WRONLY);
 
-  return audio_fd;
+  return audio_device_fd;
+}
+
+static void CloseAudioDevice(int *audio_device_fd)
+{
+  if (*audio_device_fd == 0)
+    return;
+
+  close(*audio_device_fd);
+  *audio_device_fd = -1;
 }
 
 static boolean TestAudioDevices(void)
@@ -99,21 +131,21 @@ static boolean TestAudioDevices(void)
     DEVICENAME_DSP,
     DEVICENAME_AUDIO
   };
-  int audio_fd = -1;
+  int audio_device_fd = -1;
   int i;
 
   /* look for available audio devices, starting with preferred ones */
   for (i=0; i<sizeof(audio_device_name)/sizeof(char *); i++)
-    if ((audio_fd = OpenAudioDevice(audio_device_name[i])) >= 0)
+    if ((audio_device_fd = OpenAudioDevice(audio_device_name[i])) >= 0)
       break;
 
-  if (audio_fd < 0)
+  if (audio_device_fd < 0)
   {
     Error(ERR_WARN, "cannot open audio device -- no sound");
     return FALSE;
   }
 
-  close(audio_fd);
+  close(audio_device_fd);
 
   audio.device_name = audio_device_name[i];
 
@@ -177,11 +209,167 @@ void InitPlaylist(void)
 {
   int i;
 
-  for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+  for(i=0; i<NUM_MIXER_CHANNELS; i++)
     playlist[i] = emptySoundControl;
   playing_sounds = 0;
 }
 
+#if 1
+static void PlaylistRemoveSound(int pos)
+{
+  if (!playing_sounds || !playlist[pos].active)
+    return;
+
+  playlist[pos] = emptySoundControl;
+  playing_sounds--;
+
+  if (!playing_sounds)
+    CloseAudioDevice(&audio.device_fd);
+}
+
+static void WriteReloadInfoToPipe(char *set_name, int type)
+{
+  struct SoundControl snd_ctrl = emptySoundControl;
+  TreeInfo *ti = (type == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current :
+		  artwork.mus_current);
+  unsigned long str_size1 = strlen(leveldir_current->fullpath) + 1;
+  unsigned long str_size2 = strlen(ti->basepath) + 1;
+  unsigned long str_size3 = strlen(ti->fullpath) + 1;
+
+  snd_ctrl.state = type;
+  snd_ctrl.data_len = strlen(set_name) + 1;
+
+  if (write(audio.soundserver_pipe[1], &snd_ctrl,
+	    sizeof(snd_ctrl)) < 0 ||
+      write(audio.soundserver_pipe[1], set_name,
+	    snd_ctrl.data_len) < 0 ||
+      write(audio.soundserver_pipe[1], leveldir_current,
+	    sizeof(TreeInfo)) < 0 ||
+      write(audio.soundserver_pipe[1], ti,
+	    sizeof(TreeInfo)) < 0 ||
+      write(audio.soundserver_pipe[1], &str_size1,
+	    sizeof(unsigned long)) < 0 ||
+      write(audio.soundserver_pipe[1], &str_size2,
+	    sizeof(unsigned long)) < 0 ||
+      write(audio.soundserver_pipe[1], &str_size3,
+	    sizeof(unsigned long)) < 0 ||
+      write(audio.soundserver_pipe[1], leveldir_current->fullpath,
+	    str_size1) < 0 ||
+      write(audio.soundserver_pipe[1], ti->basepath,
+	    str_size2) < 0 ||
+      write(audio.soundserver_pipe[1], ti->fullpath,
+	    str_size3) < 0)
+  {
+    Error(ERR_WARN, "cannot pipe to child process -- no sounds");
+    audio.sound_available = audio.sound_enabled = FALSE;
+    return;
+  }
+}
+
+static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl)
+{
+  TreeInfo **ti_ptr = ((snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) ?
+		       &artwork.snd_current : &artwork.mus_current);
+  TreeInfo *ti = *ti_ptr;
+  unsigned long str_size1, str_size2, str_size3;
+  static char *set_name = NULL;
+
+  if (set_name)
+    free(set_name);
+
+  set_name = checked_malloc(snd_ctrl.data_len);
+
+  if (leveldir_current == NULL)
+    leveldir_current = checked_calloc(sizeof(TreeInfo));
+  if (ti == NULL)
+    ti = *ti_ptr = checked_calloc(sizeof(TreeInfo));
+  if (leveldir_current->fullpath != NULL)
+    free(leveldir_current->fullpath);
+  if (ti->basepath != NULL)
+    free(ti->basepath);
+  if (ti->fullpath != NULL)
+    free(ti->fullpath);
+
+  if (read(audio.soundserver_pipe[0], set_name,
+	   snd_ctrl.data_len) != snd_ctrl.data_len ||
+      read(audio.soundserver_pipe[0], leveldir_current,
+	   sizeof(TreeInfo)) != sizeof(TreeInfo) ||
+      read(audio.soundserver_pipe[0], ti,
+	   sizeof(TreeInfo)) != sizeof(TreeInfo) ||
+      read(audio.soundserver_pipe[0], &str_size1,
+	   sizeof(unsigned long)) != sizeof(unsigned long) ||
+      read(audio.soundserver_pipe[0], &str_size2,
+	   sizeof(unsigned long)) != sizeof(unsigned long) ||
+      read(audio.soundserver_pipe[0], &str_size3,
+	   sizeof(unsigned long)) != sizeof(unsigned long))
+    Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
+
+  leveldir_current->fullpath = checked_calloc(str_size1);
+  ti->basepath = checked_calloc(str_size2);
+  ti->fullpath = checked_calloc(str_size3);
+
+  if (read(audio.soundserver_pipe[0], leveldir_current->fullpath,
+	   str_size1) != str_size1 ||
+      read(audio.soundserver_pipe[0], ti->basepath,
+	   str_size2) != str_size2 ||
+      read(audio.soundserver_pipe[0], ti->fullpath,
+	   str_size3) != str_size3)
+    Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
+
+  if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
+    artwork.sounds_set_current = set_name;
+  else
+    artwork.music_set_current = set_name;
+}
+
+static void HandleSoundRequest(struct SoundControl snd_ctrl)
+{
+  int i;
+
+  if (IS_RELOADING(snd_ctrl))
+  {
+    ReadReloadInfoFromPipe(snd_ctrl);
+    InitPlaylist();
+    CloseAudioDevice(&audio.device_fd);
+
+    if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
+      ReloadCustomSounds();
+    else
+      ReloadCustomMusic();
+  }
+  else if (IS_FADING(snd_ctrl))
+  {
+    if (!playing_sounds)
+      return;
+
+    if (IS_MUSIC(snd_ctrl))
+    {
+      playlist[MUSIC_CHANNEL].state |= SND_CTRL_FADE;
+      return;
+    }
+
+    for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
+      if (playlist[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+	playlist[i].state |= SND_CTRL_FADE;
+  }
+  else if (IS_STOPPING(snd_ctrl))
+  {
+    if (!playing_sounds)
+      return;
+
+    if (IS_MUSIC(snd_ctrl))
+    {
+      PlaylistRemoveSound(MUSIC_CHANNEL);
+      return;
+    }
+
+    for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
+      if (playlist[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+	PlaylistRemoveSound(i);
+  }
+}
+#endif
+
 void StartSoundserver(void)
 {
   if (!audio.sound_available)
@@ -206,12 +394,12 @@ void SoundServer(void)
   InitPlaylist();
 
   stereo_volume[PSND_MAX_LEFT2RIGHT] = 0;
-  for(i=0;i<PSND_MAX_LEFT2RIGHT;i++)
+  for(i=0; i<PSND_MAX_LEFT2RIGHT; i++)
     stereo_volume[i] =
-      (int)sqrt((float)(PSND_MAX_LEFT2RIGHT*PSND_MAX_LEFT2RIGHT-i*i));
+      (int)sqrt((float)(PSND_MAX_LEFT2RIGHT * PSND_MAX_LEFT2RIGHT - i * i));
 
 #if defined(PLATFORM_HPUX)
-  InitAudioDevice_HPUX();
+  InitAudioDevice_HPUX(&afmt);
 #endif
 
   FD_ZERO(&sound_fdset); 
@@ -227,161 +415,135 @@ void SoundServer(void)
 	!= sizeof(snd_ctrl))
       Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
 
-    if (snd_ctrl.reload_sounds || snd_ctrl.reload_music)
-    {
-      for(i=0;i<MAX_SOUNDS_PLAYING;i++)
-	playlist[i] = emptySoundControl;
-      playing_sounds = 0;
-
-      close(audio.device_fd);
-
-      if (snd_ctrl.reload_sounds)
-	ReloadSounds();
-      else
-	ReloadMusic();
+    HandleSoundRequest(snd_ctrl);
 
+    if (IS_RELOADING(snd_ctrl))
       continue;
-    }
 
 #if defined(AUDIO_STREAMING_DSP)
 
-    if (snd_ctrl.fade_sound)
-    {
-      if (!playing_sounds)
-	continue;
-
-      for(i=0;i<MAX_SOUNDS_PLAYING;i++)
-	if (snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr)
-	  playlist[i].fade_sound = TRUE;
-    }
-    else if (snd_ctrl.stop_all_sounds)
-    {
-      if (!playing_sounds)
-	continue;
-
-      for(i=0;i<MAX_SOUNDS_PLAYING;i++)
-	playlist[i] = emptySoundControl;
-      playing_sounds = 0;
-
-      close(audio.device_fd);
-    }
-    else if (snd_ctrl.stop_sound)
-    {
-      if (!playing_sounds)
-	continue;
-
-      for(i=0;i<MAX_SOUNDS_PLAYING;i++)
-	if (playlist[i].nr == snd_ctrl.nr)
-	{
-	  playlist[i] = emptySoundControl;
-	  playing_sounds--;
-	}
-
-      if (!playing_sounds)
-	close(audio.device_fd);
-    }
-
     if (playing_sounds || snd_ctrl.active)
     {
-      struct timeval delay = { 0, 0 };
-      byte *sample_ptr;
-      long sample_size;
-      static long max_sample_size = 0;
-      static long fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
-      int sample_rate = DEFAULT_AUDIO_SAMPLE_RATE;
-      static boolean stereo = TRUE;
-
       if (playing_sounds ||
 	  (audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0)
       {
+	struct timeval delay = { 0, 0 };
+
 	if (!playing_sounds)	/* we just opened the audio device */
-	{
-#if defined(AUDIO_LINUX_IOCTL)
-	  stereo = InitAudioDevice_Linux(fragment_size, sample_rate);
-#elif defined(PLATFORM_NETBSD)
-	  stereo = InitAudioDevice_NetBSD(fragment_size, sample_rate);
-#endif
-	  max_sample_size = fragment_size / (stereo ? 2 : 1);
-	}
+	  InitAudioDevice_DSP(&afmt);
 
 	if (snd_ctrl.active)	/* new sound has arrived */
 	  SoundServer_InsertNewSound(snd_ctrl);
 
-	while(playing_sounds &&
-	      select(audio.soundserver_pipe[0] + 1,
-		     &sound_fdset, NULL, NULL, &delay) < 1)
+	while (playing_sounds &&
+	       select(audio.soundserver_pipe[0] + 1,
+		      &sound_fdset, NULL, NULL, &delay) < 1)
 	{	
+	  int max_sample_size;
+	  int fragment_size = afmt.fragment_size;
+	  int sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2);
+	  boolean stereo = afmt.stereo;
+
 	  FD_SET(audio.soundserver_pipe[0], &sound_fdset);
 
+	  max_sample_size = fragment_size / ((stereo ? 2 : 1) * sample_bytes);
+
 	  /* first clear the last premixing buffer */
-	  memset(premix_last_buffer, 0, fragment_size * sizeof(int));
+	  memset(premix_last_buffer, 0,
+		 max_sample_size * (stereo ? 2 : 1) * sizeof(long));
 
-	  for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+	  for(i=0; i<NUM_MIXER_CHANNELS; i++)
 	  {
+	    void *sample_ptr;
+	    int sample_len;
+	    int sample_pos;
+	    int sample_size;
 	    int j;
 
 	    if (!playlist[i].active)
 	      continue;
 
-	    /* get pointer and size of the actual sound sample */
-	    sample_ptr = playlist[i].data_ptr+playlist[i].playingpos;
-	    sample_size =
-	      MIN(max_sample_size,playlist[i].data_len-playlist[i].playingpos);
+	    /* pointer, lenght and actual playing position of sound sample */
+	    sample_ptr = playlist[i].data_ptr;
+	    sample_len = playlist[i].data_len;
+	    sample_pos = playlist[i].playingpos;
+	    sample_size = MIN(max_sample_size, sample_len - sample_pos);
 	    playlist[i].playingpos += sample_size;
 
-	    /* fill the first mixing buffer with original sample */
-	    memcpy(premix_first_buffer,sample_ptr,sample_size);
+	    /* copy original sample to first mixing buffer */
+	    if (playlist[i].format == AUDIO_FORMAT_U8)
+	      for (j=0; j<sample_size; j++)
+		premix_first_buffer[j] =
+		  ((short)(((byte *)sample_ptr)[sample_pos + j] ^ 0x80)) << 8;
+	    else	/* AUDIO_FORMAT_S16 */
+	      for (j=0; j<sample_size; j++)
+		premix_first_buffer[j] =
+		  ((short *)sample_ptr)[sample_pos + j];
 
 	    /* are we about to restart a looping sound? */
-	    if (playlist[i].loop && sample_size<max_sample_size)
+	    if (IS_LOOP(playlist[i]) && sample_size < max_sample_size)
 	    {
-	      playlist[i].playingpos = max_sample_size-sample_size;
-	      memcpy(premix_first_buffer+sample_size,
-		     playlist[i].data_ptr,max_sample_size-sample_size);
-	      sample_size = max_sample_size;
+	      while (sample_size < max_sample_size)
+	      {
+		int restarted_sample_size =
+		  MIN(max_sample_size - sample_size, sample_len);
+
+		if (playlist[i].format == AUDIO_FORMAT_U8)
+		  for (j=0; j<restarted_sample_size; j++)
+		    premix_first_buffer[sample_size + j] =
+		      ((short)(((byte *)sample_ptr)[j] ^ 0x80)) << 8;
+		else
+		  for (j=0; j<restarted_sample_size; j++)
+		    premix_first_buffer[sample_size + j] =
+		      ((short *)sample_ptr)[j];
+
+		playlist[i].playingpos = restarted_sample_size;
+		sample_size += restarted_sample_size;
+	      }
 	    }
 
 	    /* decrease volume if sound is fading out */
-	    if (playlist[i].fade_sound &&
+	    if (IS_FADING(playlist[i]) &&
 		playlist[i].volume >= SOUND_FADING_VOLUME_THRESHOLD)
 	      playlist[i].volume -= SOUND_FADING_VOLUME_STEP;
 
 	    /* adjust volume of actual sound sample */
 	    if (playlist[i].volume != PSND_MAX_VOLUME)
-	      for(j=0;j<sample_size;j++)
+	      for(j=0; j<sample_size; j++)
 		premix_first_buffer[j] =
-		  (playlist[i].volume * (int)premix_first_buffer[j])
+		  (playlist[i].volume * (long)premix_first_buffer[j])
 		    >> PSND_MAX_VOLUME_BITS;
 
 	    /* fill the last mixing buffer with stereo or mono sound */
 	    if (stereo)
 	    {
-	      int middle_pos = PSND_MAX_LEFT2RIGHT/2;
-	      int left_volume = stereo_volume[middle_pos+playlist[i].stereo];
-	      int right_volume = stereo_volume[middle_pos-playlist[i].stereo];
+	      int middle_pos = PSND_MAX_LEFT2RIGHT / 2;
+	      int left_volume = stereo_volume[middle_pos + playlist[i].stereo];
+	      int right_volume= stereo_volume[middle_pos - playlist[i].stereo];
 
-	      for(j=0;j<sample_size;j++)
+	      for(j=0; j<sample_size; j++)
 	      {
 		premix_left_buffer[j] =
-		  (left_volume * (int)premix_first_buffer[j])
+		  (left_volume * premix_first_buffer[j])
 		    >> PSND_MAX_LEFT2RIGHT_BITS;
 		premix_right_buffer[j] =
-		  (right_volume * (int)premix_first_buffer[j])
+		  (right_volume * premix_first_buffer[j])
 		    >> PSND_MAX_LEFT2RIGHT_BITS;
-		premix_last_buffer[2*j+0] += premix_left_buffer[j];
-		premix_last_buffer[2*j+1] += premix_right_buffer[j];
+
+		premix_last_buffer[2 * j + 0] += premix_left_buffer[j];
+		premix_last_buffer[2 * j + 1] += premix_right_buffer[j];
 	      }
 	    }
 	    else
 	    {
-	      for(j=0;j<sample_size;j++)
-		premix_last_buffer[j] += (int)premix_first_buffer[j];
+	      for(j=0; j<sample_size; j++)
+		premix_last_buffer[j] += premix_first_buffer[j];
 	    }
 
 	    /* delete completed sound entries from the playlist */
 	    if (playlist[i].playingpos >= playlist[i].data_len)
 	    {
-	      if (playlist[i].loop)
+	      if (IS_LOOP(playlist[i]))
 		playlist[i].playingpos = 0;
 	      else
 	      {
@@ -396,15 +558,32 @@ void SoundServer(void)
 	    }
 	  }
 
-	  /* put last mixing buffer to final playing buffer */
-	  for(i=0; i<fragment_size; i++)
+	  /* prepare final playing buffer according to system audio format */
+	  for(i=0; i<max_sample_size * (stereo ? 2 : 1); i++)
 	  {
-	    if (premix_last_buffer[i]<-255)
-	      playing_buffer[i] = 0;
-	    else if (premix_last_buffer[i]>255)
-	      playing_buffer[i] = 255;
-	    else
-	      playing_buffer[i] = (premix_last_buffer[i]>>1)^0x80;
+	    /* cut off at 17 bit value */
+	    if (premix_last_buffer[i] < -65535)
+	      premix_last_buffer[i] = -65535;
+	    else if (premix_last_buffer[i] > 65535)
+	      premix_last_buffer[i] = 65535;
+
+	    /* shift to 16 bit value */
+	    premix_last_buffer[i] >>= 1;
+
+	    if (afmt.format & AUDIO_FORMAT_U8)
+	    {
+	      playing_buffer[i] = (premix_last_buffer[i] >> 8) ^ 0x80;
+	    }
+	    else if (afmt.format & AUDIO_FORMAT_LE)	/* 16 bit */
+	    {
+	      playing_buffer[2 * i + 0] = premix_last_buffer[i] & 0xff;
+	      playing_buffer[2 * i + 1] = premix_last_buffer[i] >> 8;
+	    }
+	    else					/* big endian */
+	    {
+	      playing_buffer[2 * i + 0] = premix_last_buffer[i] >> 8;
+	      playing_buffer[2 * i + 1] = premix_last_buffer[i] & 0xff;
+	    }
 	  }
 
 	  /* finally play the sound fragment */
@@ -419,7 +598,7 @@ void SoundServer(void)
 
 #else /* !AUDIO_STREAMING_DSP */
 
-    if (snd_ctrl.active && !snd_ctrl.loop)
+    if (snd_ctrl.active && !IS_LOOP(snd_ctrl))
     {
       struct timeval delay = { 0, 0 };
       byte *sample_ptr;
@@ -432,9 +611,9 @@ void SoundServer(void)
       {
 	playing_sounds = 1;
 
-	while(playing_sounds &&
-	      select(audio.soundserver_pipe[0] + 1,
-		     &sound_fdset, NULL, NULL, &delay) < 1)
+	while (playing_sounds &&
+	       select(audio.soundserver_pipe[0] + 1,
+		      &sound_fdset, NULL, NULL, &delay) < 1)
 	{	
 	  FD_SET(audio.soundserver_pipe[0], &sound_fdset);
 
@@ -485,14 +664,16 @@ static void sound_handler(struct SoundControl snd_ctrl)
     if (!playing_sounds)
       return;
 
-    for (i=0; i<MAX_SOUNDS_PLAYING; i++)
-      if ((snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr) &&
+    for (i=0; i<NUM_MIXER_CHANNELS; i++)
+      if ((snd_ctrl.stop_all_sounds ||
+	   (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr) ||
+	   (i == audio.music_channel && snd_ctrl.music)) &&
 	  !playlist[i].fade_sound)
       {
 	playlist[i].fade_sound = TRUE;
 	if (voice_check(playlist[i].voice))
 	  voice_ramp_volume(playlist[i].voice, 1000, 0);
-	playlist[i].loop = PSND_NO_LOOP;
+	playlist[i].state &= ~SND_CTRL_IS_LOOP;
       }
   }
   else if (snd_ctrl.stop_all_sounds)
@@ -505,10 +686,10 @@ static void sound_handler(struct SoundControl snd_ctrl)
   {
     if (!playing_sounds)
       return;
-    SoundServer_StopSound(snd_ctrl.nr);
+    SoundServer_StopSound(snd_ctrl);
   }
 
-  for (i=0; i<MAX_SOUNDS_PLAYING; i++)
+  for (i=0; i<NUM_MIXER_CHANNELS; i++)
   {
     if (!playlist[i].active || playlist[i].loop)
       continue;
@@ -528,17 +709,65 @@ static void sound_handler(struct SoundControl snd_ctrl)
 }
 #endif /* PLATFORM_MSDOS */
 
+#if 0
+#if defined(TARGET_SDL)
+static void sound_handler_SDL(struct SoundControl snd_ctrl)
+{
+  /* copy sound_handler() here ... */
+}
+#endif /* TARGET_SDL */
+#endif
+
 #if !defined(PLATFORM_WIN32)
 static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
 {
+  SoundInfo *snd_info;
   int i, k;
 
+#if 0
+  printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds);
+#endif
+
+  if (IS_MUSIC(snd_ctrl))
+    snd_ctrl.nr = snd_ctrl.nr % num_music;
+  else if (snd_ctrl.nr >= num_sounds)
+    return;
+
+  snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
+  if (snd_info == NULL)
+  {
+#if 0
+    printf("sound/music %d undefined\n", snd_ctrl.nr);
+#endif
+    return;
+  }
+
+#if 0
+  printf("-> %d\n", playing_sounds);
+#endif
+
+  if (playing_sounds == NUM_MIXER_CHANNELS)
+  {
+    for (i=0; i<NUM_MIXER_CHANNELS; i++)
+    {
+      if (playlist[i].data_ptr == NULL)
+      {
+#if 1
+	printf("THIS SHOULD NEVER HAPPEN! [%d]\n", i);
+#endif
+
+	playlist[i] = emptySoundControl;
+	playing_sounds--;
+      }
+    }
+  }
+
   /* if playlist is full, remove oldest sound */
-  if (playing_sounds==MAX_SOUNDS_PLAYING)
+  if (playing_sounds == NUM_MIXER_CHANNELS)
   {
-    int longest=0, longest_nr=0;
+    int longest = 0, longest_nr = 0;
 
-    for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+    for (i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
     {
 #if !defined(PLATFORM_MSDOS)
       int actual = 100 * playlist[i].playingpos / playlist[i].data_len;
@@ -546,10 +775,10 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
       int actual = playlist[i].playingpos;
 #endif
 
-      if (!playlist[i].loop && actual>longest)
+      if (!IS_LOOP(playlist[i]) && actual > longest)
       {
-	longest=actual;
-	longest_nr=i;
+	longest = actual;
+	longest_nr = i;
       }
     }
 #if defined(PLATFORM_MSDOS)
@@ -561,38 +790,37 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
   }
 
   /* check if sound is already being played (and how often) */
-  for(k=0,i=0;i<MAX_SOUNDS_PLAYING;i++)
-  {
+  for (k=0, i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
     if (playlist[i].nr == snd_ctrl.nr)
       k++;
-  }
 
   /* restart loop sounds only if they are just fading out */
-  if (k>=1 && snd_ctrl.loop)
+  if (k >= 1 && IS_LOOP(snd_ctrl))
   {
-    for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+    for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
     {
-      if (playlist[i].nr == snd_ctrl.nr && playlist[i].fade_sound)
+      if (playlist[i].nr == snd_ctrl.nr && IS_FADING(playlist[i]))
       {
-	playlist[i].fade_sound = FALSE;
+	playlist[i].state &= ~SND_CTRL_FADE;
 	playlist[i].volume = PSND_MAX_VOLUME;
 #if defined(PLATFORM_MSDOS)
-        playlist[i].loop = PSND_LOOP;
+        playlist[i].state |= SND_CTRL_LOOP;
         voice_stop_volumeramp(playlist[i].voice);
         voice_ramp_volume(playlist[i].voice, playlist[i].volume, 1000);
 #endif
       }
     }
+
     return;
   }
 
   /* don't play sound more than n times simultaneously (with n == 2 for now) */
-  if (k>=2)
+  if (k >= 2)
   {
-    int longest=0, longest_nr=0;
+    int longest = 0, longest_nr = 0;
 
     /* look for oldest equal sound */
-    for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+    for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
     {
       int actual;
 
@@ -604,10 +832,10 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
 #else
       actual = playlist[i].playingpos;
 #endif
-      if (actual>=longest)
+      if (actual >= longest)
       {
-	longest=actual;
-	longest_nr=i;
+	longest = actual;
+	longest_nr = i;
       }
     }
 
@@ -619,18 +847,56 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
     playing_sounds--;
   }
 
-  /* neuen Sound in Liste packen */
-  for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+  /* add new sound to playlist */
+  for(i=0; i<NUM_MIXER_CHANNELS; i++)
   {
-    if (!playlist[i].active)
+#if 0
+    printf("CHECKING CHANNEL %d FOR SOUND %d ...\n", i, snd_ctrl.nr);
+#endif
+
+    /*
+    if (!playlist[i].active ||
+	(IS_MUSIC(snd_ctrl) && i == MUSIC_CHANNEL))
+    */
+    if ((i == MUSIC_CHANNEL && IS_MUSIC(snd_ctrl)) ||
+	(i != MUSIC_CHANNEL && !playlist[i].active))
     {
+      snd_ctrl.data_ptr = snd_info->data_ptr;
+      snd_ctrl.data_len = snd_info->data_len;
+      snd_ctrl.format   = snd_info->format;
+
+#if 1
+      if (snd_info->data_len == 0)
+      {
+	printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n");
+      }
+#endif
+
+#if 1
+      if (IS_MUSIC(snd_ctrl) && i == MUSIC_CHANNEL && playlist[i].active)
+      {
+	printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n");
+
+#if 1
+	playlist[i] = emptySoundControl;
+	playing_sounds--;
+#endif
+      }
+#endif
+
       playlist[i] = snd_ctrl;
       playing_sounds++;
 
+#if 0
+      printf("NEW SOUND %d ADDED TO PLAYLIST\n", snd_ctrl.nr);
+#endif
+
 #if defined(PLATFORM_MSDOS)
-      playlist[i].voice = allocate_voice(Sound[snd_ctrl.nr].sample_ptr);
-      if(snd_ctrl.loop)
+      playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr);
+
+      if (snd_ctrl.loop)
         voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP);
+
       voice_set_volume(playlist[i].voice, snd_ctrl.volume);
       voice_set_pan(playlist[i].voice, snd_ctrl.stereo);
       voice_start(playlist[i].voice);       
@@ -649,7 +915,7 @@ void SoundServer_FadeSound(int nr)
   if (!playing_sounds)
     return;
 
-  for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+  for(i=0;i<NUM_MIXER_CHANNELS;i++)
     if (snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr)
       playlist[i].fade_sound = TRUE;
 }
@@ -657,15 +923,18 @@ void SoundServer_FadeSound(int nr)
 
 #if !defined(PLATFORM_WIN32)
 #if defined(PLATFORM_MSDOS)
-static void SoundServer_StopSound(int nr)
+static void SoundServer_StopSound(struct SoundControl snd_ctrl)
 {
+  int nr = snd_ctrl.nr;
   int i;
 
   if (!playing_sounds)
     return;
 
-  for(i=0;i<MAX_SOUNDS_PLAYING;i++)
-    if (playlist[i].nr == nr)
+  for(i=0; i<NUM_MIXER_CHANNELS; i++)
+  {
+    if ((i == audio.music_channel && snd_ctrl.music) ||
+	(i != audio.music_channel && playlist[i].nr == nr))
     {
 #if defined(PLATFORM_MSDOS)
       voice_set_volume(playlist[i].voice, 0);
@@ -674,6 +943,7 @@ static void SoundServer_StopSound(int nr)
       playlist[i] = emptySoundControl;
       playing_sounds--;
     }
+  }
 
 #if !defined(PLATFORM_MSDOS)
   if (!playing_sounds)
@@ -685,13 +955,13 @@ static void SoundServer_StopAllSounds()
 {
   int i;
 
-  for(i=0;i<MAX_SOUNDS_PLAYING;i++)
+  for(i=0; i<NUM_MIXER_CHANNELS; i++)
   {
 #if defined(PLATFORM_MSDOS)
     voice_set_volume(playlist[i].voice, 0);
     deallocate_voice(playlist[i].voice);
 #endif
-    playlist[i]=emptySoundControl;
+    playlist[i] = emptySoundControl;
   }
   playing_sounds = 0;
 
@@ -708,16 +978,31 @@ static void SoundServer_StopAllSounds()
 /* ------------------------------------------------------------------------- */
 
 #if defined(AUDIO_LINUX_IOCTL)
-static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate)
+static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt)
 {
   /* "ioctl()" expects pointer to 'int' value for stereo flag
      (boolean is defined as 'char', which will not work here) */
+  unsigned int fragment_spec = 0;
+  int fragment_size_query;
   int stereo = TRUE;
-  unsigned long fragment_spec = 0;
+  struct
+  {
+    int format_ioctl;
+    int format_result;
+  }
+  formats[] =
+  {
+    /* supported audio format in preferred order */
+    { AFMT_S16_LE,	AUDIO_FORMAT_S16 | AUDIO_FORMAT_LE },
+    { AFMT_S16_BE,	AUDIO_FORMAT_S16 | AUDIO_FORMAT_BE },
+    { AFMT_U8,		AUDIO_FORMAT_U8                    },
+    { -1,		-1 }
+  };
+  int i;
 
   /* determine logarithm (log2) of the fragment size */
-  for (fragment_spec=0; (1 << fragment_spec) < fragment_size;
-       fragment_spec++);
+  while ((1 << fragment_spec) < afmt->fragment_size)
+    fragment_spec++;
 
   /* use two fragments (play one fragment, prepare the other);
      one fragment would result in interrupted audio output, more
@@ -733,36 +1018,43 @@ static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate)
     Error(ERR_EXIT_SOUND_SERVER,
 	  "cannot set fragment size of /dev/dsp -- no sounds");
 
-  /* try if we can use stereo sound */
-  if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
+  i = 0;
+  afmt->format = 0;
+  while (formats[i].format_result != -1)
   {
-#ifdef DEBUG
-    static boolean reported = FALSE;
-
-    if (!reported)
+    unsigned int audio_format = formats[i].format_ioctl;
+    if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0)
     {
-      Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp");
-      reported = TRUE;
+      afmt->format = formats[i].format_result;
+      break;
     }
-#endif
-    stereo = FALSE;
   }
 
-  if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &sample_rate) < 0)
+  if (afmt->format == 0)	/* no supported audio format found */
+    Error(ERR_EXIT_SOUND_SERVER,
+	  "cannot set audio format of /dev/dsp -- no sounds");
+
+  /* try if we can use stereo sound */
+  afmt->stereo = TRUE;
+  if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0)
+    afmt->stereo = FALSE;
+
+  if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0)
     Error(ERR_EXIT_SOUND_SERVER,
 	  "cannot set sample rate of /dev/dsp -- no sounds");
 
   /* get the real fragmentation size; this should return 512 */
-  if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size) < 0)
+  if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0)
     Error(ERR_EXIT_SOUND_SERVER,
 	  "cannot get fragment size of /dev/dsp -- no sounds");
-
-  return (boolean)stereo;
+  if (fragment_size_query != afmt->fragment_size)
+    Error(ERR_EXIT_SOUND_SERVER,
+	  "cannot set fragment size of /dev/dsp -- no sounds");
 }
 #endif	/* AUDIO_LINUX_IOCTL */
 
 #if defined(PLATFORM_NETBSD)
-static boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate)
+static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt)
 {
   audio_info_t a_info;
   boolean stereo = TRUE;
@@ -774,23 +1066,25 @@ static boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate)
   a_info.play.sample_rate = sample_rate;
   a_info.blocksize = fragment_size;
 
+  afmt->format = AUDIO_FORMAT_U8;
+  afmt->stereo = TRUE;
+
   if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
   {
     /* try to disable stereo */
     a_info.play.channels = 1;
-    stereo = FALSE;
+
+    afmt->stereo = FALSE;
 
     if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0)
       Error(ERR_EXIT_SOUND_SERVER,
 	    "cannot set sample rate of /dev/audio -- no sounds");
   }
-
-  return stereo;
 }
 #endif /* PLATFORM_NETBSD */
 
 #if defined(PLATFORM_HPUX)
-static boolean InitAudioDevice_HPUX()
+static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt)
 {
   struct audio_describe ainfo;
   int audio_ctl;
@@ -808,12 +1102,27 @@ static boolean InitAudioDevice_HPUX()
   ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
   ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
 
-  close(audio_ctl);
+  afmt->format = AUDIO_FORMAT_U8;
+  afmt->stereo = FALSE;
+  afmt->sample_rate = 8000;
 
-  return TRUE;	/* to provide common interface for InitAudioDevice_...() */
+  close(audio_ctl);
 }
 #endif /* PLATFORM_HPUX */
 
+#if defined(PLATFORM_UNIX)
+static void InitAudioDevice_DSP(struct AudioFormatInfo *afmt)
+{
+#if defined(AUDIO_LINUX_IOCTL)
+  InitAudioDevice_Linux(afmt);
+#elif defined(PLATFORM_NETBSD)
+  InitAudioDevice_NetBSD(afmt);
+#elif defined(PLATFORM_HPUX)
+  InitAudioDevice_HPUX(afmt);
+#endif
+}
+#endif /* PLATFORM_UNIX */
+
 #if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP)
 
 /* these two are stolen from "sox"... :) */
@@ -926,203 +1235,308 @@ static int ulaw_to_linear(unsigned char ulawbyte)
 /* ========================================================================= */
 /* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS                          */
 
-void ReloadSounds()
-{
-  printf("reloading sounds ...\n");
-}
-
-void ReloadMusic()
-{
-  printf("reloading music ...\n");
-}
-
 #define CHUNK_ID_LEN            4       /* IFF style chunk id length */
-#define WAV_HEADER_SIZE		20	/* size of WAV file header */
+#define WAV_HEADER_SIZE		16	/* size of WAV file header */
 
-static boolean LoadSoundExt(char *sound_name, boolean is_music)
+static SoundInfo *Load_WAV(char *filename)
 {
-  struct SampleInfo *snd_info;
-  char *filename;
+  SoundInfo *snd_info;
 #if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS)
   byte sound_header_buffer[WAV_HEADER_SIZE];
-  char chunk[CHUNK_ID_LEN + 1];
-  int chunk_size, dummy;
+  char chunk_name[CHUNK_ID_LEN + 1];
+  int chunk_size;
   FILE *file;
   int i;
 #endif
 
   if (!audio.sound_available)
-    return FALSE;
+    return NULL;
 
-  num_sounds++;
-  Sound = checked_realloc(Sound, num_sounds * sizeof(struct SampleInfo));
-
-  snd_info = &Sound[num_sounds - 1];
-  snd_info->name = sound_name;
+#if 0
+  printf("loading WAV file '%s'\n", filename);
+#endif
 
-  filename = getPath2((is_music ? options.music_directory :
-		       options.sounds_directory), snd_info->name);
+  snd_info = checked_calloc(sizeof(SoundInfo));
 
 #if defined(TARGET_SDL)
 
-  if ((snd_info->mix_chunk = Mix_LoadWAV(filename)) == NULL)
+  if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL)
   {
-    Error(ERR_WARN, "cannot read sound file '%s' -- no sounds", filename);
-    free(filename);
-    return FALSE;
+    Error(ERR_WARN, "cannot read sound file '%s'", filename);
+    free(snd_info);
+    return NULL;
   }
 
-#elif defined(PLATFORM_UNIX)
+#elif defined(TARGET_ALLEGRO)
+
+  if ((snd_info->data_ptr = load_sample(filename)) == NULL)
+  {
+    Error(ERR_WARN, "cannot read sound file '%s'", filename);
+    free(snd_info);
+    return NULL;
+  }
+
+#else	/* PLATFORM_UNIX */
 
   if ((file = fopen(filename, MODE_READ)) == NULL)
   {
-    Error(ERR_WARN, "cannot open sound file '%s' -- no sounds", filename);
-    free(filename);
-    return FALSE;
+    Error(ERR_WARN, "cannot open sound file '%s'", filename);
+    free(snd_info);
+    return NULL;
   }
 
-  /* read chunk "RIFF" */
-  getFileChunk(file, chunk, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN);
-  if (strcmp(chunk, "RIFF") != 0)
+  /* read chunk id "RIFF" */
+  getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN);
+  if (strcmp(chunk_name, "RIFF") != 0)
   {
     Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
     fclose(file);
-    free(filename);
-    return FALSE;
+    free(snd_info);
+    return NULL;
   }
 
-  /* read chunk "WAVE" */
-  getFileChunk(file, chunk, &dummy, BYTE_ORDER_LITTLE_ENDIAN);
-  if (strcmp(chunk, "WAVE") != 0)
+  /* read "RIFF" type id "WAVE" */
+  getFileChunk(file, chunk_name, NULL, BYTE_ORDER_LITTLE_ENDIAN);
+  if (strcmp(chunk_name, "WAVE") != 0)
   {
-    Error(ERR_WARN, "missing 'WAVE' chunk of sound file '%s'", filename);
+    Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename);
     fclose(file);
-    free(filename);
-    return FALSE;
+    free(snd_info);
+    return NULL;
   }
 
-  /* read header information */
-  for (i=0; i<WAV_HEADER_SIZE; i++)
-    sound_header_buffer[i] = fgetc(file);
+  while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN))
+  {
+    if (strcmp(chunk_name, "fmt ") == 0)
+    {
+      /* read header information */
+      for (i=0; i < MIN(chunk_size, WAV_HEADER_SIZE); i++)
+	sound_header_buffer[i] = fgetc(file);
+
+      if (chunk_size > WAV_HEADER_SIZE)
+	ReadUnusedBytesFromFile(file, chunk_size - WAV_HEADER_SIZE);
+    }
+    else if (strcmp(chunk_name, "data") == 0)
+    {
+      snd_info->data_len = chunk_size;
+      snd_info->data_ptr = checked_malloc(snd_info->data_len);
+
+      /* read sound data */
+      if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) !=
+	  snd_info->data_len)
+      {
+	Error(ERR_WARN,"cannot read 'data' chunk of sound file '%s'",filename);
+	fclose(file);
+	free(snd_info->data_ptr);
+	free(snd_info);
+	return NULL;
+      }
 
-  /* read chunk "data" */
-  getFileChunk(file, chunk, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN);
-  if (strcmp(chunk, "data") != 0)
+      /* check for odd number of sample bytes (data chunk is word aligned) */
+      if ((chunk_size % 2) == 1)
+	ReadUnusedBytesFromFile(file, 1);
+    }
+    else	/* unknown chunk -- ignore */
+      ReadUnusedBytesFromFile(file, chunk_size);
+  }
+
+  fclose(file);
+
+  if (snd_info->data_ptr == NULL)
   {
     Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename);
-    fclose(file);
-    free(filename);
-    return FALSE;
+    free(snd_info);
+    return NULL;
   }
 
-  snd_info->data_len = chunk_size;
-  snd_info->data_ptr = checked_malloc(snd_info->data_len);
+  snd_info->format = AUDIO_FORMAT_U8;
 
-  /* read sound data */
-  if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) !=
-      snd_info->data_len)
+#endif	/* PLATFORM_UNIX */
+
+  snd_info->type = SND_TYPE_WAV;
+  snd_info->source_filename = getStringCopy(filename);
+
+  return snd_info;
+}
+
+static void deleteSoundEntry(SoundInfo **snd_info)
+{
+  if (*snd_info)
   {
-    Error(ERR_WARN, "cannot read sound file '%s' -- no sounds", filename);
-    fclose(file);
-    free(filename);
-    return FALSE;
-  }
+    char *filename = (*snd_info)->source_filename;
 
-  fclose(file);
+#if 0
+    printf("[decrementing reference counter of sound '%s']\n", filename);
+#endif
 
-  for (i=0; i<snd_info->data_len; i++)
-    snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80;
+    if (--(*snd_info)->num_references <= 0)
+    {
+#if 0
+      printf("[deleting sound '%s']\n", filename);
+#endif
 
-#else /* PLATFORM_MSDOS */
+      /*
+      FreeSound(*snd_info);
+      */
+      deleteNodeFromList(&SoundFileList, filename, FreeSound);
+    }
+
+    *snd_info = NULL;
+  }
+}
 
-  snd_info->sample_ptr = load_sample(filename);
-  if (!snd_info->sample_ptr)
+static void replaceSoundEntry(SoundInfo **snd_info, char *filename)
+{
+  ListNode *node;
+
+  /* check if the old and the new sound file are the same */
+  if (*snd_info && strcmp((*snd_info)->source_filename, filename) == 0)
   {
-    Error(ERR_WARN, "cannot read sound file '%s' -- no sounds", filename);
-    return FALSE;
+    /* The old and new sound are the same (have the same filename and path).
+       This usually means that this sound does not exist in this sound set
+       and a fallback to the existing sound is done. */
+
+#if 0
+    printf("[sound '%s' already exists (same list entry)]\n", filename);
+#endif
+
+    return;
   }
 
+  /* delete existing sound file entry */
+  deleteSoundEntry(snd_info);
+
+  /* check if the new sound file already exists in the list of sounds */
+  if ((node = getNodeFromKey(SoundFileList, filename)) != NULL)
+  {
+#if 0
+      printf("[sound '%s' already exists (other list entry)]\n", filename);
 #endif
 
-  free(filename);
+      *snd_info = (SoundInfo *)node->content;
+      (*snd_info)->num_references++;
+  }
+  else if ((*snd_info = Load_WAV(filename)) != NULL)	/* load new sound */
+  {
+    (*snd_info)->num_references = 1;
+    addNodeToList(&SoundFileList, (*snd_info)->source_filename, *snd_info);
+  }
+}
 
-  return TRUE;
+static void LoadCustomSound(SoundInfo **snd_info, char *basename)
+{
+  char *filename = getCustomSoundFilename(basename);
+
+  if (strcmp(basename, SND_FILE_UNDEFINED) == 0)
+  {
+    deleteSoundEntry(snd_info);
+    return;
+  }
+
+  if (filename == NULL)
+  {
+    Error(ERR_WARN, "cannot find sound file '%s'", basename);
+    return;
+  }
+
+  replaceSoundEntry(snd_info, filename);
 }
 
-boolean LoadSound(char *sound_name)
+void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries)
 {
-  return LoadSoundExt(sound_name, FALSE);
+  if (Sound == NULL)
+    Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *));
+
+  sound_effect = sounds_list;
+  num_sounds = num_list_entries;
 }
 
-boolean LoadMod(char *mod_name)
+void LoadSoundToList(char *basename, int list_pos)
 {
-#if defined(TARGET_SDL)
-  struct SampleInfo *mod_info;
-  char *filename;
+  if (Sound == NULL || list_pos >= num_sounds)
+    return;
+
+#if 0
+  printf("loading sound '%s' ...  [%d]\n",
+	 basename, getNumNodes(SoundFileList));
+#endif
 
-  num_mods++;
-  Mod = checked_realloc(Mod, num_mods * sizeof(struct SampleInfo));
+  LoadCustomSound(&Sound[list_pos], basename);
 
-  mod_info = &Mod[num_mods - 1];
-  mod_info->name = mod_name;
+#if 0
+  printf("loading sound '%s' done [%d]\n",
+	 basename, getNumNodes(SoundFileList));
+#endif
+}
+
+static MusicInfo *Load_MOD(char *filename)
+{
+#if defined(TARGET_SDL)
+  MusicInfo *mod_info;
+
+  if (!audio.sound_available)
+    return NULL;
 
-  filename = getPath2(options.music_directory, mod_info->name);
+  mod_info = checked_calloc(sizeof(MusicInfo));
 
-  if ((mod_info->mix_music = Mix_LoadMUS(filename)) == NULL)
+  if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL)
   {
-    Error(ERR_WARN, "cannot read music file '%s' -- no music", filename);
-    free(filename);
-    return FALSE;
+    Error(ERR_WARN, "cannot read music file '%s'", filename);
+    free(mod_info);
+    return NULL;
   }
 
-  free(filename);
+  mod_info->type = MUS_TYPE_MOD;
+  mod_info->source_filename = getStringCopy(filename);
 
-  return TRUE;
+  return mod_info;
 #else
-  return FALSE;
+  return NULL;
 #endif
 }
 
-int LoadMusic(void)
+void LoadCustomMusic(void)
 {
+  char *music_directory = getCustomMusicDirectory();
   DIR *dir;
   struct dirent *dir_entry;
-  int num_wav_music = 0;
-  int num_mod_music = 0;
 
   if (!audio.sound_available)
-    return 0;
+    return;
 
-  if ((dir = opendir(options.music_directory)) == NULL)
+  if ((dir = opendir(music_directory)) == NULL)
   {
-    Error(ERR_WARN, "cannot read music directory '%s'",
-	  options.music_directory);
+    Error(ERR_WARN, "cannot read music directory '%s'", music_directory);
     audio.music_available = FALSE;
-    return 0;
+    return;
   }
 
   while ((dir_entry = readdir(dir)) != NULL)	/* loop until last dir entry */
   {
-    char *filename = dir_entry->d_name;
+    char *basename = dir_entry->d_name;
+    char *filename = getPath2(music_directory, basename);
+    MusicInfo *mus_info = NULL;
+
+    if (FileIsSound(basename))
+      mus_info = Load_WAV(filename);
+    else if (FileIsMusic(basename))
+      mus_info = Load_MOD(filename);
+
+    free(filename);
 
-    if (FileIsSound(filename) && LoadSoundExt(filename, TRUE))
-      num_wav_music++;
-    else if (FileIsMusic(filename) && LoadMod(filename))
-      num_mod_music++;
+    if (mus_info)
+    {
+      num_music++;
+      Music = checked_realloc(Music, num_music * sizeof(MusicInfo *));
+      Music[num_music -1] = mus_info;
+    }
   }
 
   closedir(dir);
 
-  if (num_wav_music == 0 && num_mod_music == 0)
+  if (num_music == 0)
     Error(ERR_WARN, "cannot find any valid music files in directory '%s'",
-	  options.music_directory);
-
-  num_music = (num_mod_music > 0 ? num_mod_music : num_wav_music);
-
-  audio.mods_available = (num_mod_music > 0);
-  audio.music_available = (num_music > 0);
-
-  return num_music;
+	  music_directory);
 }
 
 void PlayMusic(int nr)
@@ -1130,69 +1544,79 @@ void PlayMusic(int nr)
   if (!audio.music_available)
     return;
 
-  if (!audio.mods_available)
-    nr = num_sounds - num_music + nr;
-
 #if defined(TARGET_SDL)
-  if (audio.mods_available)	/* play MOD music */
+
+  nr = nr % num_music;
+
+  if (Music[nr]->type == MUS_TYPE_MOD)
   {
-    Mix_PlayMusic(Mod[nr].mix_music, -1);
+    Mix_PlayMusic(Music[nr]->data_ptr, -1);
     Mix_VolumeMusic(SOUND_MAX_VOLUME);	/* must be _after_ Mix_PlayMusic()! */
   }
   else				/* play WAV music loop */
   {
     Mix_Volume(audio.music_channel, SOUND_MAX_VOLUME);
-    Mix_PlayChannel(audio.music_channel, Sound[nr].mix_chunk, -1);
+    Mix_PlayChannel(audio.music_channel, Music[nr]->data_ptr, -1);
   }
+
 #else
-  audio.music_nr = nr;
-  PlaySoundLoop(nr);
+
+  PlaySoundMusic(nr);
+
 #endif
 }
 
 void PlaySound(int nr)
 {
-  PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_NO_LOOP);
+  PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_SOUND);
 }
 
 void PlaySoundStereo(int nr, int stereo)
 {
-  PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, PSND_NO_LOOP);
+  PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, SND_CTRL_PLAY_SOUND);
 }
 
 void PlaySoundLoop(int nr)
 {
-  PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP);
+  PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_LOOP);
+}
+
+void PlaySoundMusic(int nr)
+{
+  PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC);
 }
 
-void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
+void PlaySoundExt(int nr, int volume, int stereo, int state)
 {
   struct SoundControl snd_ctrl = emptySoundControl;
 
-  if (!audio.sound_available || !audio.sound_enabled)
+  if (!audio.sound_available ||
+      !audio.sound_enabled ||
+      audio.sound_deactivated)
     return;
 
-  if (volume<PSND_MIN_VOLUME)
+  if (volume < PSND_MIN_VOLUME)
     volume = PSND_MIN_VOLUME;
-  else if (volume>PSND_MAX_VOLUME)
+  else if (volume > PSND_MAX_VOLUME)
     volume = PSND_MAX_VOLUME;
 
-  if (stereo<PSND_MAX_LEFT)
+  if (stereo < PSND_MAX_LEFT)
     stereo = PSND_MAX_LEFT;
-  else if (stereo>PSND_MAX_RIGHT)
+  else if (stereo > PSND_MAX_RIGHT)
     stereo = PSND_MAX_RIGHT;
 
-  snd_ctrl.nr		= nr;
-  snd_ctrl.volume	= volume;
-  snd_ctrl.stereo	= stereo;
-  snd_ctrl.loop		= loop;
-  snd_ctrl.active	= TRUE;
-  snd_ctrl.data_ptr	= Sound[nr].data_ptr;
-  snd_ctrl.data_len	= Sound[nr].data_len;
+  snd_ctrl.active = TRUE;
+  snd_ctrl.nr     = nr;
+  snd_ctrl.volume = volume;
+  snd_ctrl.stereo = stereo;
+  snd_ctrl.state  = state;
 
 #if defined(TARGET_SDL)
-  Mix_Volume(-1, SOUND_MAX_VOLUME);
-  Mix_PlayChannel(-1, Sound[nr].mix_chunk, (loop ? -1 : 0));
+  if (Sound[nr])
+  {
+    Mix_Volume(-1, SOUND_MAX_VOLUME);
+    Mix_PlayChannel(-1, Sound[nr]->data_ptr, (state & SND_CTRL_LOOP ? -1 : 0));
+  }
 #elif defined(PLATFORM_UNIX)
   if (audio.soundserver_pid == 0)	/* we are child process */
     return;
@@ -1210,28 +1634,26 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
 
 void FadeMusic(void)
 {
-#if defined(TARGET_SDL)
   if (!audio.sound_available)
     return;
 
-  if (audio.mods_available)
-    Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
-  else
-    Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL);
+#if defined(TARGET_SDL)
+  Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
+  Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL);
 #else
-  FadeSound(audio.music_nr);
+  StopSoundExt(-1, SND_CTRL_FADE_MUSIC);
 #endif
 }
 
 void FadeSound(int nr)
 {
-  StopSoundExt(nr, SSND_FADE_SOUND);
+  StopSoundExt(nr, SND_CTRL_FADE_SOUND);
 }
 
 void FadeSounds()
 {
   FadeMusic();
-  StopSoundExt(-1, SSND_FADE_ALL_SOUNDS);
+  StopSoundExt(-1, SND_CTRL_FADE_ALL);
 }
 
 void StopMusic(void)
@@ -1240,53 +1662,44 @@ void StopMusic(void)
   if (!audio.sound_available)
     return;
 
-  if (audio.mods_available)
-    Mix_HaltMusic();
-  else
-    Mix_HaltChannel(audio.music_channel);
+  Mix_HaltMusic();
+  Mix_HaltChannel(audio.music_channel);
 #else
-  StopSound(audio.music_nr);
+  StopSoundExt(-1, SND_CTRL_STOP_MUSIC);
 #endif
 }
 
 void StopSound(int nr)
 {
-  StopSoundExt(nr, SSND_STOP_SOUND);
+  StopSoundExt(nr, SND_CTRL_STOP_SOUND);
 }
 
 void StopSounds()
 {
-  StopSoundExt(-1, SSND_STOP_ALL_SOUNDS);
+  StopMusic();
+  StopSoundExt(-1, SND_CTRL_STOP_ALL);
 }
 
-void StopSoundExt(int nr, int method)
+void StopSoundExt(int nr, int state)
 {
   struct SoundControl snd_ctrl = emptySoundControl;
 
   if (!audio.sound_available)
     return;
 
-  if (SSND_FADING(method))
-    snd_ctrl.fade_sound = TRUE;
-
-  if (SSND_ALL(method))
-    snd_ctrl.stop_all_sounds = TRUE;
-  else
-  {
-    snd_ctrl.nr = nr;
-    snd_ctrl.stop_sound = TRUE;
-  }
+  snd_ctrl.nr    = nr;
+  snd_ctrl.state = state;
 
 #if defined(TARGET_SDL)
 
-  if (SSND_FADING(method))
+  if (state & SND_CTRL_FADE)
   {
     int i;
 
     for (i=0; i<audio.channels; i++)
-      if (i != audio.music_channel || snd_ctrl.stop_all_sounds)
+      if (i != audio.music_channel || snd_ctrl.music)
 	Mix_FadeOutChannel(i, SOUND_FADING_INTERVAL);
-    if (snd_ctrl.stop_all_sounds)
+    if (state & SND_CTRL_MUSIC)
       Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
   }
   else
@@ -1294,14 +1707,14 @@ void StopSoundExt(int nr, int method)
     int i;
 
     for (i=0; i<audio.channels; i++)
-      if (i != audio.music_channel || snd_ctrl.stop_all_sounds)
+      if (i != audio.music_channel || snd_ctrl.music)
 	Mix_HaltChannel(i);
-    if (snd_ctrl.stop_all_sounds)
+    if (state & SND_CTRL_MUSIC)
       Mix_HaltMusic();
   }
 
-#else
-#if !defined(PLATFORM_MSDOS)
+#elif !defined(PLATFORM_MSDOS)
+
   if (audio.soundserver_pid == 0)	/* we are child process */
     return;
 
@@ -1311,79 +1724,322 @@ void StopSoundExt(int nr, int method)
     audio.sound_available = audio.sound_enabled = FALSE;
     return;
   }
-#else
+#else /* PLATFORM_MSDOS */
   sound_handler(snd_ctrl);
 #endif
+}
+
+ListNode *newListNode()
+{
+  return checked_calloc(sizeof(ListNode));
+}
+
+void addNodeToList(ListNode **node_first, char *key, void *content)
+{
+  ListNode *node_new = newListNode();
+
+#if 0
+  printf("LIST: adding node with key '%s'\n", key);
 #endif
+
+  node_new->key = getStringCopy(key);
+  node_new->content = content;
+  node_new->next = *node_first;
+  *node_first = node_new;
 }
 
-void InitReloadSounds(char *set_name)
+void deleteNodeFromList(ListNode **node_first, char *key,
+			void (*destructor_function)(void *))
 {
+  if (node_first == NULL || *node_first == NULL)
+    return;
+
+#if 0
+  printf("[CHECKING LIST KEY '%s' == '%s']\n",
+	 (*node_first)->key, key);
+#endif
+
+  if (strcmp((*node_first)->key, key) == 0)
+  {
+#if 0
+    printf("[DELETING LIST ENTRY]\n");
+#endif
+
+    free((*node_first)->key);
+    if (destructor_function)
+      destructor_function((*node_first)->content);
+    *node_first = (*node_first)->next;
+  }
+  else
+    deleteNodeFromList(&(*node_first)->next, key, destructor_function);
+}
+
+ListNode *getNodeFromKey(ListNode *node_first, char *key)
+{
+  if (node_first == NULL)
+    return NULL;
+
+  if (strcmp(node_first->key, key) == 0)
+    return node_first;
+  else
+    return getNodeFromKey(node_first->next, key);
+}
+
+int getNumNodes(ListNode *node_first)
+{
+  return (node_first ? 1 + getNumNodes(node_first->next) : 0);
+}
+
+void dumpList(ListNode *node_first)
+{
+  ListNode *node = node_first;
+
+  while (node)
+  {
+    printf("['%s' (%d)]\n", node->key,
+	   ((SoundInfo *)node->content)->num_references);
+    node = node->next;
+  }
+
+  printf("[%d nodes]\n", getNumNodes(node_first));
+}
+
+static void LoadSoundsInfo()
+{
+  char *filename = getCustomSoundConfigFilename();
+  struct SetupFileList *setup_file_list;
+  int i;
+
+  /* always start with reliable default values */
+  for (i=0; i<num_sounds; i++)
+    sound_effect[i].filename = NULL;
+
+  if (filename == NULL)
+    return;
+
+  if ((setup_file_list = loadSetupFileList(filename)))
+  {
+    for (i=0; i<num_sounds; i++)
+      sound_effect[i].filename =
+	getStringCopy(getTokenValue(setup_file_list, sound_effect[i].text));
+
+    freeSetupFileList(setup_file_list);
+
+#if 1
+    for (i=0; i<num_sounds; i++)
+    {
+      printf("'%s' ", sound_effect[i].text);
+      if (sound_effect[i].filename)
+	printf("-> '%s'\n", sound_effect[i].filename);
+      else
+	printf("-> UNDEFINED [-> '%s']\n", sound_effect[i].default_filename);
+    }
+#endif
+  }
+}
+
+static void ReloadCustomSounds()
+{
+  int i;
+
+#if 0
+  printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current);
+#endif
+
+  LoadSoundsInfo();
+
+#if 0
+  printf("DEBUG: reloading %d sounds ...\n", num_sounds);
+#endif
+
+  for(i=0; i<num_sounds; i++)
+  {
+    if (sound_effect[i].filename)
+      LoadSoundToList(sound_effect[i].filename, i);
+    else
+      LoadSoundToList(sound_effect[i].default_filename, i);
+  }
+
+  /*
+  printf("list size == %d\n", getNumNodes(SoundFileList));
+  */
+
+#if 0
+  dumpList(SoundFileList);
+#endif
+}
+
+static void ReloadCustomMusic()
+{
+#if 0
+  printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current);
+#endif
+
+  FreeAllMusic();
+
+  LoadCustomMusic();
+}
+
+static void InitReloadSoundsOrMusic(char *set_name, int type)
+{
+#if 0
+#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
   struct SoundControl snd_ctrl = emptySoundControl;
+  TreeInfo *ti = (state == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current :
+		  artwork.mus_current);
+  unsigned long str_size1 = strlen(leveldir_current->fullpath) + 1;
+  unsigned long str_size2 = strlen(ti->basepath) + 1;
+  unsigned long str_size3 = strlen(ti->fullpath) + 1;
+#endif
+#endif
 
   if (!audio.sound_available)
     return;
 
-  snd_ctrl.reload_sounds = TRUE;
-
-#if defined(TARGET_SDL)
-  ReloadSounds();
+#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
+  if (type == SND_CTRL_RELOAD_SOUNDS)
+    ReloadCustomSounds();
+  else
+    ReloadCustomMusic();
 #elif defined(PLATFORM_UNIX)
   if (audio.soundserver_pid == 0)	/* we are child process */
     return;
 
-  if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
+  if (leveldir_current == NULL)		/* should never happen */
+    Error(ERR_EXIT, "leveldir_current == NULL");
+
+#if 1
+  WriteReloadInfoToPipe(set_name, type);
+#else
+
+  snd_ctrl.state = type;
+  snd_ctrl.data_len = strlen(set_name) + 1;
+
+  if (write(audio.soundserver_pipe[1], &snd_ctrl,
+	    sizeof(snd_ctrl)) < 0 ||
+      write(audio.soundserver_pipe[1], set_name,
+	    snd_ctrl.data_len) < 0 ||
+      write(audio.soundserver_pipe[1], leveldir_current,
+	    sizeof(TreeInfo)) < 0 ||
+      write(audio.soundserver_pipe[1], ti,
+	    sizeof(TreeInfo)) < 0 ||
+      write(audio.soundserver_pipe[1], &str_size1,
+	    sizeof(unsigned long)) < 0 ||
+      write(audio.soundserver_pipe[1], &str_size2,
+	    sizeof(unsigned long)) < 0 ||
+      write(audio.soundserver_pipe[1], &str_size3,
+	    sizeof(unsigned long)) < 0 ||
+      write(audio.soundserver_pipe[1], leveldir_current->fullpath,
+	    str_size1) < 0 ||
+      write(audio.soundserver_pipe[1], ti->basepath,
+	    str_size2) < 0 ||
+      write(audio.soundserver_pipe[1], ti->fullpath,
+	    str_size3) < 0)
   {
     Error(ERR_WARN, "cannot pipe to child process -- no sounds");
     audio.sound_available = audio.sound_enabled = FALSE;
     return;
   }
-#elif defined(PLATFORM_MSDOS)
-  sound_handler(snd_ctrl);
+#endif
+
 #endif
 }
 
+void InitReloadSounds(char *set_name)
+{
+  InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_SOUNDS);
+}
+
 void InitReloadMusic(char *set_name)
 {
-  struct SoundControl snd_ctrl = emptySoundControl;
+  InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_MUSIC);
+}
 
-  if (!audio.sound_available)
-    return;
+void FreeSound(void *ptr)
+{
+  SoundInfo *sound = (SoundInfo *)ptr;
 
-  snd_ctrl.reload_music = TRUE;
+  if (sound == NULL)
+    return;
 
+  if (sound->data_ptr)
+  {
 #if defined(TARGET_SDL)
-  ReloadMusic();
-#elif defined(PLATFORM_UNIX)
-  if (audio.soundserver_pid == 0)	/* we are child process */
+    Mix_FreeChunk(sound->data_ptr);
+#elif defined(TARGET_ALLEGRO)
+    destroy_sample(sound->data_ptr);
+#else	/* PLATFORM_UNIX */
+    free(sound->data_ptr);
+#endif
+  }
+
+  if (sound->source_filename)
+    free(sound->source_filename);
+
+  free(sound);
+}
+
+void FreeMusic(MusicInfo *music)
+{
+  if (music == NULL)
     return;
 
-  if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
+  if (music->data_ptr)
   {
-    Error(ERR_WARN, "cannot pipe to child process -- no sounds");
-    audio.sound_available = audio.sound_enabled = FALSE;
-    return;
-  }
-#elif defined(PLATFORM_MSDOS)
-  sound_handler(snd_ctrl);
+#if defined(TARGET_SDL)
+    if (music->type == MUS_TYPE_MOD)
+      Mix_FreeMusic(music->data_ptr);
+    else
+      Mix_FreeChunk(music->data_ptr);
+#elif defined(TARGET_ALLEGRO)
+    destroy_sample(music->data_ptr);
+#else	/* PLATFORM_UNIX */
+    free(music->data_ptr);
 #endif
+  }
+
+  free(music);
 }
 
-void FreeSounds(int num_sounds)
+void FreeAllSounds()
 {
   int i;
 
-  if (!audio.sound_available)
+  if (Sound == NULL)
     return;
 
+  printf("%s: FREEING SOUNDS ...\n",
+	 audio.soundserver_pid == 0 ? "CHILD" : "PARENT");
+
   for(i=0; i<num_sounds; i++)
-#if defined(TARGET_SDL)
-    free(Sound[i].mix_chunk);
-#elif !defined(PLATFORM_MSDOS)
-    free(Sound[i].data_ptr);
-#else
-    destroy_sample(Sound[i].sample_ptr);
-#endif
+    deleteSoundEntry(&Sound[i]);
+  /*
+    FreeSound(Sound[i]);
+  */
+
+  printf("%s: FREEING SOUNDS -- DONE\n",
+	 audio.soundserver_pid == 0 ? "CHILD" : "PARENT");
+
+  free(Sound);
+
+  Sound = NULL;
+  num_sounds = 0;
+}
+
+void FreeAllMusic()
+{
+  int i;
+
+  if (Music == NULL)
+    return;
+
+  for(i=0; i<num_music; i++)
+    FreeMusic(Music[i]);
+
+  free(Music);
+
+  Music = NULL;
+  num_music = 0;
 }
 
 /* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS                          */