X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=fbdbd87d9716fb569440219ccecac4bdaf861388;hb=2eeb33b85d7394bd58f51bdc430894f97f8ee6f5;hp=84ca1984e38a06ab3fb5cf57640fa5d1f880c678;hpb=c431e727cdc0ecec3468ab4b89cae2e9708aa49a;p=rocksndiamonds.git

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index 84ca1984..fbdbd87d 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -58,29 +58,22 @@ static int playing_sounds = 0;
 static struct SoundControl playlist[NUM_MIXER_CHANNELS];
 static struct SoundControl emptySoundControl =
 {
+#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
-};
-
-#if defined(PLATFORM_UNIX)
-static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1];
-static short premix_first_buffer[SND_BLOCKSIZE];
-#if defined(AUDIO_STREAMING_DSP)
-static short premix_left_buffer[SND_BLOCKSIZE];
-static short premix_right_buffer[SND_BLOCKSIZE];
-static long premix_last_buffer[SND_BLOCKSIZE];
-#endif
-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 void InitAudioDevice(struct AudioFormatInfo *);
+
+#if defined(PLATFORM_UNIX)
+#if !defined(AUDIO_STREAMING_DSP)
 static unsigned char linear_to_ulaw(int);
 static int ulaw_to_linear(unsigned char);
+#endif
 #elif defined(PLATFORM_MSDOS)
 static void SoundServer_InsertNewSound(struct SoundControl);
 static void SoundServer_StopSound(struct SoundControl);
@@ -94,21 +87,30 @@ 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_device_fd;
+}
+
+static void CloseAudioDevice(int *audio_device_fd)
+{
+  if (*audio_device_fd == 0)
+    return;
 
-  return audio_fd;
+  close(*audio_device_fd);
+  *audio_device_fd = -1;
 }
 
 static boolean TestAudioDevices(void)
@@ -118,21 +120,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];
 
@@ -201,57 +203,162 @@ void InitPlaylist(void)
   playing_sounds = 0;
 }
 
-#if 0
+#if 1
+static void PlaylistRemoveSound(int pos)
+{
+  if (!playing_sounds || !playlist[pos].active)
+    return;
+
+  playlist[pos] = emptySoundControl;
+  playing_sounds--;
+}
+
+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 (snd_ctrl.fade_sound)
+  if (IS_RELOADING(snd_ctrl))		/* load new sound or music files */
   {
-    if (!playing_sounds)
-      continue;
+    ReadReloadInfoFromPipe(snd_ctrl);
+    InitPlaylist();
+    CloseAudioDevice(&audio.device_fd);
 
-    if (snd_ctrl.music)
-      playlist[audio.music_channel].fade_sound = TRUE;
+    if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
+      ReloadCustomSounds();
     else
-      for(i=0; i<NUM_MIXER_CHANNELS; i++)
-	if (snd_ctrl.stop_all_sounds ||
-	    (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr))
-	  playlist[i].fade_sound = TRUE;
+      ReloadCustomMusic();
   }
-  else if (snd_ctrl.stop_all_sounds)
+  else if (IS_FADING(snd_ctrl))		/* fade out existing sound or music */
   {
     if (!playing_sounds)
-      continue;
+      return;
 
-    for(i=0; i<NUM_MIXER_CHANNELS; i++)
-      playlist[i] = emptySoundControl;
-    playing_sounds = 0;
+    if (IS_MUSIC(snd_ctrl))
+    {
+      playlist[MUSIC_CHANNEL].state |= SND_CTRL_FADE;
+      return;
+    }
 
-    close(audio.device_fd);
+    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 (snd_ctrl.stop_sound)
+  else if (IS_STOPPING(snd_ctrl))	/* stop existing sound or music */
   {
     if (!playing_sounds)
-      continue;
+      return;
 
-    if (snd_ctrl.music)
+    if (IS_MUSIC(snd_ctrl))
     {
-      playlist[audio.music_channel] = emptySoundControl;
-      playing_sounds--;
+      PlaylistRemoveSound(MUSIC_CHANNEL);
+      return;
     }
 
-    for(i=0; i<NUM_MIXER_CHANNELS; i++)
-    {
-      if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr)
-      {
-	playlist[i] = emptySoundControl;
-	playing_sounds--;
-      }
-    }
+    for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
+      if (playlist[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+	PlaylistRemoveSound(i);
 
     if (!playing_sounds)
-      close(audio.device_fd);
+      CloseAudioDevice(&audio.device_fd);
+  }
+  else if (snd_ctrl.active)		/* add new sound to playlist */
+  {
+    SoundServer_InsertNewSound(snd_ctrl);
   }
 }
 #endif
@@ -267,11 +374,251 @@ void StartSoundserver(void)
 #endif
 }
 
-#if defined(PLATFORM_UNIX)
-void SoundServer(void)
+#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
+
+static void CopySampleToMixingBuffer(struct SoundControl *snd_ctrl,
+				     int sample_pos, int sample_size,
+				     short *buffer_ptr)
 {
+  void *sample_ptr = snd_ctrl->data_ptr;
   int i;
 
+  if (snd_ctrl->format == AUDIO_FORMAT_U8)
+    for (i=0; i<sample_size; i++)
+      *buffer_ptr++ =
+	((short)(((byte *)sample_ptr)[sample_pos + i] ^ 0x80)) << 8;
+  else	/* AUDIO_FORMAT_S16 */
+    for (i=0; i<sample_size; i++)
+      *buffer_ptr++ =
+	((short *)sample_ptr)[sample_pos + i];
+}
+
+#if defined(AUDIO_STREAMING_DSP)
+static void SoundServer_Mixer()
+{
+  static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1];
+  static boolean stereo_volume_calculated = FALSE;
+  static short premix_first_buffer[SND_BLOCKSIZE];
+  static short premix_left_buffer[SND_BLOCKSIZE];
+  static short premix_right_buffer[SND_BLOCKSIZE];
+  static long premix_last_buffer[SND_BLOCKSIZE];
+  static byte playing_buffer[SND_BLOCKSIZE];
+  int max_sample_size;
+  int fragment_size = afmt.fragment_size;
+  int sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2);
+  boolean stereo = afmt.stereo;
+  int i, j;
+
+  if (!stereo_volume_calculated)
+  {
+    for(i=0; i<=PSND_MAX_LEFT2RIGHT; i++)
+      stereo_volume[i] =
+	(int)sqrt((float)(PSND_MAX_LEFT2RIGHT * PSND_MAX_LEFT2RIGHT - i * i));
+
+    stereo_volume_calculated = TRUE;
+  }
+
+  if (!playing_sounds)
+    return;
+
+  if (audio.device_fd < 0)
+  {
+    if ((audio.device_fd = OpenAudioDevice(audio.device_name)) < 0)
+      return;
+
+    InitAudioDevice(&afmt);
+  }
+
+  max_sample_size = fragment_size / ((stereo ? 2 : 1) * sample_bytes);
+
+  /* first clear the last premixing buffer */
+  memset(premix_last_buffer, 0,
+	 max_sample_size * (stereo ? 2 : 1) * sizeof(long));
+
+  for(i=0; i<NUM_MIXER_CHANNELS; i++)
+  {
+    void *sample_ptr;
+    int sample_len;
+    int sample_pos;
+    int sample_size;
+
+    if (!playlist[i].active)
+      continue;
+
+    /* 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;
+
+    /* copy original sample to first mixing buffer */
+    CopySampleToMixingBuffer(&playlist[i], sample_pos, sample_size,
+			     premix_first_buffer);
+
+    /* are we about to restart a looping sound? */
+    if (IS_LOOP(playlist[i]) && 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 (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++)
+	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];
+
+      for(j=0; j<sample_size; j++)
+      {
+	premix_left_buffer[j] =
+	  (left_volume * premix_first_buffer[j])
+	    >> PSND_MAX_LEFT2RIGHT_BITS;
+	premix_right_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];
+      }
+    }
+    else
+    {
+      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 (IS_LOOP(playlist[i]))
+	playlist[i].playingpos = 0;
+      else
+	PlaylistRemoveSound(i);
+    }
+    else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
+      PlaylistRemoveSound(i);
+  }
+
+  /* prepare final playing buffer according to system audio format */
+  for(i=0; i<max_sample_size * (stereo ? 2 : 1); i++)
+  {
+    /* 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 */
+  write(audio.device_fd, playing_buffer, fragment_size);
+
+  if (!playing_sounds)
+    CloseAudioDevice(&audio.device_fd);
+}
+
+#else /* !AUDIO_STREAMING_DSP */
+
+static int SoundServer_SimpleAudio(struct SoundControl snd_ctrl)
+{
+  static short premix_first_buffer[SND_BLOCKSIZE];
+  static byte playing_buffer[SND_BLOCKSIZE];
+  int max_sample_size = SND_BLOCKSIZE;
+  void *sample_ptr;
+  int sample_len;
+  int sample_pos;
+  int sample_size;
+  int i, j;
+
+  i = 1;
+
+  /* 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;
+
+  /* copy original sample to first mixing buffer */
+  CopySampleToMixingBuffer(&playlist[i], sample_pos, sample_size,
+			   premix_first_buffer);
+
+  /* adjust volume of actual sound sample */
+  if (playlist[i].volume != PSND_MAX_VOLUME)
+    for(j=0; j<sample_size; j++)
+      premix_first_buffer[j] =
+	(playlist[i].volume * (long)premix_first_buffer[j])
+	  >> PSND_MAX_VOLUME_BITS;
+
+  /* might be needed for u-law /dev/audio */
+#if 0
+  for(j=0; j<sample_size; j++)
+    playing_buffer[j] =
+      linear_to_ulaw(premix_first_buffer[j]);
+#endif
+
+  /* delete completed sound entries from the playlist */
+  if (playlist[i].playingpos >= playlist[i].data_len)
+    PlaylistRemoveSound(i);
+
+  for(i=0; i<sample_size; i++)
+    playing_buffer[i] = (premix_first_buffer[i] >> 8) ^ 0x80;
+
+  /* finally play the sound fragment */
+  write(audio.device_fd, playing_buffer, sample_size);
+
+  return sample_size;
+}
+#endif /* !AUDIO_STREAMING_DSP */
+
+void SoundServer()
+{
   struct SoundControl snd_ctrl;
   fd_set sound_fdset;
 
@@ -279,13 +626,8 @@ void SoundServer(void)
 
   InitPlaylist();
 
-  stereo_volume[PSND_MAX_LEFT2RIGHT] = 0;
-  for(i=0; i<PSND_MAX_LEFT2RIGHT; i++)
-    stereo_volume[i] =
-      (int)sqrt((float)(PSND_MAX_LEFT2RIGHT * PSND_MAX_LEFT2RIGHT - i * i));
-
 #if defined(PLATFORM_HPUX)
-  InitAudioDevice_HPUX(&afmt);
+  InitAudioDevice(&afmt);
 #endif
 
   FD_ZERO(&sound_fdset); 
@@ -293,6 +635,8 @@ void SoundServer(void)
 
   while(1)	/* wait for sound playing commands from client */
   {
+    struct timeval delay = { 0, 0 };
+
     FD_SET(audio.soundserver_pipe[0], &sound_fdset);
     select(audio.soundserver_pipe[0] + 1, &sound_fdset, NULL, NULL, NULL);
     if (!FD_ISSET(audio.soundserver_pipe[0], &sound_fdset))
@@ -301,356 +645,49 @@ void SoundServer(void)
 	!= sizeof(snd_ctrl))
       Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
 
-    if (snd_ctrl.reload_sounds || snd_ctrl.reload_music)
-    {
-      char *set_name = checked_malloc(snd_ctrl.data_len);
-      TreeInfo **ti_ptr =
-	(snd_ctrl.reload_sounds ? &artwork.snd_current : &artwork.mus_current);
-      TreeInfo *ti = *ti_ptr;
-      unsigned long str_size1, str_size2, str_size3;
-
-      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");
-
-      InitPlaylist();
-
-      close(audio.device_fd);
-
-      if (snd_ctrl.reload_sounds)
-      {
-	artwork.sounds_set_current = set_name;
-	ReloadCustomSounds();
-      }
-      else
-      {
-	artwork.music_set_current = set_name;
-	ReloadCustomMusic();
-      }
-
-      free(set_name);
-
-      continue;
-    }
+    HandleSoundRequest(snd_ctrl);
 
 #if defined(AUDIO_STREAMING_DSP)
 
-#if 0
-    HandleSoundRequest(snd_ctrl);
-#else
-
-    if (snd_ctrl.fade_sound)
+    while (playing_sounds && select(audio.soundserver_pipe[0] + 1,
+				    &sound_fdset, NULL, NULL, &delay) < 1)
     {
-      if (!playing_sounds)
-	continue;
+      FD_SET(audio.soundserver_pipe[0], &sound_fdset);
 
-      if (snd_ctrl.music)
-	playlist[audio.music_channel].fade_sound = TRUE;
-      else
-	for(i=0; i<NUM_MIXER_CHANNELS; i++)
-	  if (snd_ctrl.stop_all_sounds ||
-	      (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr))
-	    playlist[i].fade_sound = TRUE;
+      SoundServer_Mixer();
     }
-    else if (snd_ctrl.stop_all_sounds)
-    {
-      if (!playing_sounds)
-	continue;
-
-      for(i=0; i<NUM_MIXER_CHANNELS; i++)
-	playlist[i] = emptySoundControl;
-      playing_sounds = 0;
 
-      close(audio.device_fd);
-    }
-    else if (snd_ctrl.stop_sound)
-    {
-      if (!playing_sounds)
-	continue;
+#else /* !AUDIO_STREAMING_DSP */
 
-      if (snd_ctrl.music)
-      {
-	if (playlist[audio.music_channel].active)
-	{
-	  playlist[audio.music_channel] = emptySoundControl;
-	  playing_sounds--;
-	}
-      }
+    if (!snd_ctrl.active || IS_LOOP(snd_ctrl) ||
+	(audio.device_fd = OpenAudioDevice(audio.device_name)) < 0)
+      continue;
 
-      for(i=0; i<NUM_MIXER_CHANNELS; i++)
-      {
-	if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr)
-	{
-	  playlist[i] = emptySoundControl;
-	  playing_sounds--;
-	}
-      }
+    InitAudioDevice(&afmt);
 
-      if (!playing_sounds)
-	close(audio.device_fd);
-    }
-#endif
+    delay.tv_sec = 0;
+    delay.tv_usec = 0;
 
-    if (playing_sounds || snd_ctrl.active)
+    while (playing_sounds && select(audio.soundserver_pipe[0] + 1,
+				    &sound_fdset, NULL, NULL, &delay) < 1)
     {
-      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 */
-	  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)
-	{	
-	  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,
-		 max_sample_size * (stereo ? 2 : 1) * sizeof(long));
-
-	  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;
-
-	    /* 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;
-
-	    /* 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)
-	    {
-	      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 &&
-		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++)
-		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];
-
-	      for(j=0; j<sample_size; j++)
-	      {
-		premix_left_buffer[j] =
-		  (left_volume * premix_first_buffer[j])
-		    >> PSND_MAX_LEFT2RIGHT_BITS;
-		premix_right_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];
-	      }
-	    }
-	    else
-	    {
-	      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)
-		playlist[i].playingpos = 0;
-	      else
-	      {
-		playlist[i] = emptySoundControl;
-		playing_sounds--;
-	      }
-	    }
-	    else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
-	    {
-	      playlist[i] = emptySoundControl;
-	      playing_sounds--;
-	    }
-	  }
-
-	  /* prepare final playing buffer according to system audio format */
-	  for(i=0; i<max_sample_size * (stereo ? 2 : 1); i++)
-	  {
-	    /* 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 */
-	  write(audio.device_fd, playing_buffer, fragment_size);
-	}
-
-	/* if no sounds playing, free device for other sound programs */
-	if (!playing_sounds)
-	  close(audio.device_fd);
-      }
-    }
+      int wait_percent = 90;	/* wait 90% of the real playing time */
+      int sample_size;
 
-#else /* !AUDIO_STREAMING_DSP */
+      FD_SET(audio.soundserver_pipe[0], &sound_fdset);
 
-    if (snd_ctrl.active && !snd_ctrl.loop)
-    {
-      struct timeval delay = { 0, 0 };
-      byte *sample_ptr;
-      long sample_size, max_sample_size = SND_BLOCKSIZE;
-      long sample_rate = 8000;	/* standard "/dev/audio" sampling rate */
-      int wait_percent = 90;	/* wait 90% of the real playing time */
-      int i;
+      sample_size = SoundServer_SimpleAudio(snd_ctrl);
 
-      if ((audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0)
-      {
-	playing_sounds = 1;
-
-	while (playing_sounds &&
-	       select(audio.soundserver_pipe[0] + 1,
-		      &sound_fdset, NULL, NULL, &delay) < 1)
-	{	
-	  FD_SET(audio.soundserver_pipe[0], &sound_fdset);
-
-	  /* get pointer and size of the actual sound sample */
-	  sample_ptr = snd_ctrl.data_ptr + snd_ctrl.playingpos;
-	  sample_size =
-	    MIN(max_sample_size, snd_ctrl.data_len - snd_ctrl.playingpos);
-	  snd_ctrl.playingpos += sample_size;
-
-	  /* fill the first mixing buffer with original sample */
-	  memcpy(premix_first_buffer,sample_ptr,sample_size);
-
-	  /* adjust volume of actual sound sample */
-	  if (snd_ctrl.volume != PSND_MAX_VOLUME)
-	    for(i=0;i<sample_size;i++)
-	      premix_first_buffer[i] =
-		(snd_ctrl.volume * (int)premix_first_buffer[i])
-		  >> PSND_MAX_VOLUME_BITS;
-
-	  for(i=0;i<sample_size;i++)
-	    playing_buffer[i] =
-	      linear_to_ulaw(((int)premix_first_buffer[i]) << 8);
-
-	  if (snd_ctrl.playingpos >= snd_ctrl.data_len)
-	    playing_sounds = 0;
-
-	  /* finally play the sound fragment */
-	  write(audio.device_fd,playing_buffer,sample_size);
-
-	  delay.tv_sec = 0;
-	  delay.tv_usec = ((sample_size*10*wait_percent)/(sample_rate))*1000;
-	}
-	close(audio.device_fd);
-      }
+      delay.tv_sec = 0;
+      delay.tv_usec =
+	((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000;
     }
+
+    CloseAudioDevice(&audio.device_fd);
+
+    /* delete all sounds from playlist */
+    InitPlaylist();
+
 #endif /* !AUDIO_STREAMING_DSP */
   }
 }
@@ -675,7 +712,7 @@ static void sound_handler(struct SoundControl snd_ctrl)
 	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)
@@ -715,55 +752,7 @@ static void sound_handler(struct SoundControl snd_ctrl)
 #if defined(TARGET_SDL)
 static void sound_handler_SDL(struct SoundControl snd_ctrl)
 {
-  int i;
-
-  if (snd_ctrl.fade_sound)
-  {
-    if (!playing_sounds)
-      return;
-
-    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;
-      }
-  }
-  else if (snd_ctrl.stop_all_sounds)
-  {
-    if (!playing_sounds)
-      return;
-    SoundServer_StopAllSounds();
-  }
-  else if (snd_ctrl.stop_sound)
-  {
-    if (!playing_sounds)
-      return;
-    SoundServer_StopSound(snd_ctrl);
-  }
-
-  for (i=0; i<NUM_MIXER_CHANNELS; i++)
-  {
-    if (!playlist[i].active || playlist[i].loop)
-      continue;
-
-    playlist[i].playingpos = voice_get_position(playlist[i].voice);
-    playlist[i].volume = voice_get_volume(playlist[i].voice);
-    if (playlist[i].playingpos == -1 || !playlist[i].volume)
-    {
-      deallocate_voice(playlist[i].voice);
-      playlist[i] = emptySoundControl;
-      playing_sounds--;
-    }
-  }
-
-  if (snd_ctrl.active)
-    SoundServer_InsertNewSound(snd_ctrl);
+  /* copy sound_handler() here ... */
 }
 #endif /* TARGET_SDL */
 #endif
@@ -774,12 +763,16 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
   SoundInfo *snd_info;
   int i, k;
 
-  if (snd_ctrl.music)
+#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 = (snd_ctrl.music ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
+  snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]);
   if (snd_info == NULL)
   {
 #if 0
@@ -813,7 +806,7 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
   {
     int longest = 0, longest_nr = 0;
 
-    for (i=0; i<NUM_MIXER_CHANNELS; 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;
@@ -821,7 +814,7 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
       int actual = playlist[i].playingpos;
 #endif
 
-      if (i != audio.music_channel && !playlist[i].loop && actual > longest)
+      if (!IS_LOOP(playlist[i]) && actual > longest)
       {
 	longest = actual;
 	longest_nr = i;
@@ -836,22 +829,21 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
   }
 
   /* check if sound is already being played (and how often) */
-  for (k=0,i=0; i<NUM_MIXER_CHANNELS; i++)
-    if (i != audio.music_channel && playlist[i].nr == snd_ctrl.nr)
+  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<NUM_MIXER_CHANNELS; i++)
+    for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
     {
-      if (i != audio.music_channel && 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
@@ -867,13 +859,11 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
     int longest = 0, longest_nr = 0;
 
     /* look for oldest equal sound */
-    for(i=0; i<NUM_MIXER_CHANNELS; i++)
+    for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
     {
       int actual;
 
-      if (!playlist[i].active ||
-	  i == audio.music_channel ||
-	  playlist[i].nr != snd_ctrl.nr)
+      if (!playlist[i].active || playlist[i].nr != snd_ctrl.nr)
 	continue;
 
 #if !defined(PLATFORM_MSDOS)
@@ -899,8 +889,16 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
   /* add new sound to playlist */
   for(i=0; i<NUM_MIXER_CHANNELS; i++)
   {
+#if 0
+    printf("CHECKING CHANNEL %d FOR SOUND %d ...\n", i, snd_ctrl.nr);
+#endif
+
+    /*
     if (!playlist[i].active ||
-	(snd_ctrl.music && i == audio.music_channel))
+	(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;
@@ -914,7 +912,7 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
 #endif
 
 #if 1
-      if (snd_ctrl.music && i == audio.music_channel && playlist[i].active)
+      if (IS_MUSIC(snd_ctrl) && i == MUSIC_CHANNEL && playlist[i].active)
       {
 	printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n");
 
@@ -928,6 +926,10 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
       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((SAMPLE *)playlist[i].data_ptr);
 
@@ -1148,7 +1150,7 @@ static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt)
 #endif /* PLATFORM_HPUX */
 
 #if defined(PLATFORM_UNIX)
-static void InitAudioDevice_DSP(struct AudioFormatInfo *afmt)
+static void InitAudioDevice(struct AudioFormatInfo *afmt)
 {
 #if defined(AUDIO_LINUX_IOCTL)
   InitAudioDevice_Linux(afmt);
@@ -1156,6 +1158,8 @@ static void InitAudioDevice_DSP(struct AudioFormatInfo *afmt)
   InitAudioDevice_NetBSD(afmt);
 #elif defined(PLATFORM_HPUX)
   InitAudioDevice_HPUX(afmt);
+#else
+  /* generic /dev/audio stuff might be placed here */
 #endif
 }
 #endif /* PLATFORM_UNIX */
@@ -1605,25 +1609,25 @@ void PlayMusic(int nr)
 
 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, PSND_MUSIC);
+  PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC);
 }
 
-void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type)
+void PlaySoundExt(int nr, int volume, int stereo, int state)
 {
   struct SoundControl snd_ctrl = emptySoundControl;
 
@@ -1642,24 +1646,17 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type)
   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_type != PSND_NO_LOOP);
-  snd_ctrl.music	= (loop_type == PSND_MUSIC);
-  snd_ctrl.active	= TRUE;
-
-#if 0
-  /* now only used internally in sound server child process */
-  snd_ctrl.data_ptr	= Sound[nr].data_ptr;
-  snd_ctrl.data_len	= Sound[nr].data_len;
-#endif
+  snd_ctrl.active = TRUE;
+  snd_ctrl.nr     = nr;
+  snd_ctrl.volume = volume;
+  snd_ctrl.stereo = stereo;
+  snd_ctrl.state  = state;
 
 #if defined(TARGET_SDL)
   if (Sound[nr])
   {
     Mix_Volume(-1, SOUND_MAX_VOLUME);
-    Mix_PlayChannel(-1, Sound[nr]->data_ptr, (loop_type ? -1 : 0));
+    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 */
@@ -1685,19 +1682,19 @@ void FadeMusic(void)
   Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
   Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL);
 #else
-  StopSoundExt(-1, SSND_FADE_MUSIC);
+  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);
+  StopSoundExt(-1, SND_CTRL_FADE_ALL);
 }
 
 void StopMusic(void)
@@ -1709,51 +1706,41 @@ void StopMusic(void)
   Mix_HaltMusic();
   Mix_HaltChannel(audio.music_channel);
 #else
-  StopSoundExt(-1, SSND_STOP_MUSIC);
+  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);
+  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 (method & SSND_FADING)
-    snd_ctrl.fade_sound = TRUE;
-
-  if (method & SSND_ALL)
-    snd_ctrl.stop_all_sounds = TRUE;
-  else
-  {
-    snd_ctrl.stop_sound = TRUE;
-    snd_ctrl.nr = nr;
-  }
-
-  if (method & SSND_MUSIC)
-    snd_ctrl.music = TRUE;
+  snd_ctrl.nr    = nr;
+  snd_ctrl.state = state;
 
 #if defined(TARGET_SDL)
 
-  if (method & SSND_FADING)
+  if (state & SND_CTRL_FADE)
   {
     int i;
 
     for (i=0; i<audio.channels; i++)
       if (i != audio.music_channel || snd_ctrl.music)
 	Mix_FadeOutChannel(i, SOUND_FADING_INTERVAL);
-    if (snd_ctrl.music)
+    if (state & SND_CTRL_MUSIC)
       Mix_FadeOutMusic(SOUND_FADING_INTERVAL);
   }
   else
@@ -1763,7 +1750,7 @@ void StopSoundExt(int nr, int method)
     for (i=0; i<audio.channels; i++)
       if (i != audio.music_channel || snd_ctrl.music)
 	Mix_HaltChannel(i);
-    if (snd_ctrl.music)
+    if (state & SND_CTRL_MUSIC)
       Mix_HaltMusic();
   }
 
@@ -1902,6 +1889,10 @@ static void ReloadCustomSounds()
 
   LoadSoundsInfo();
 
+#if 0
+  printf("DEBUG: reloading %d sounds ...\n", num_sounds);
+#endif
+
   for(i=0; i<num_sounds; i++)
   {
     if (sound_effect[i].filename)
@@ -1932,20 +1923,22 @@ static void ReloadCustomMusic()
 
 static void InitReloadSoundsOrMusic(char *set_name, int type)
 {
+#if 0
 #if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
   struct SoundControl snd_ctrl = emptySoundControl;
-  TreeInfo *ti =
-    (type == SND_RELOAD_SOUNDS ? artwork.snd_current : artwork.mus_current);
+  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;
 
 #if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
-  if (type == SND_RELOAD_SOUNDS)
+  if (type == SND_CTRL_RELOAD_SOUNDS)
     ReloadCustomSounds();
   else
     ReloadCustomMusic();
@@ -1956,8 +1949,11 @@ static void InitReloadSoundsOrMusic(char *set_name, int type)
   if (leveldir_current == NULL)		/* should never happen */
     Error(ERR_EXIT, "leveldir_current == NULL");
 
-  snd_ctrl.reload_sounds = (type == SND_RELOAD_SOUNDS);
-  snd_ctrl.reload_music  = (type == SND_RELOAD_MUSIC);
+#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,
@@ -1986,16 +1982,18 @@ static void InitReloadSoundsOrMusic(char *set_name, int type)
     return;
   }
 #endif
+
+#endif
 }
 
 void InitReloadSounds(char *set_name)
 {
-  InitReloadSoundsOrMusic(set_name, SND_RELOAD_SOUNDS);
+  InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_SOUNDS);
 }
 
 void InitReloadMusic(char *set_name)
 {
-  InitReloadSoundsOrMusic(set_name, SND_RELOAD_MUSIC);
+  InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_MUSIC);
 }
 
 void FreeSound(void *ptr)