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

diff --git a/src/libgame/sound.c b/src/libgame/sound.c
index fbdbd87d..ac814e90 100644
--- a/src/libgame/sound.c
+++ b/src/libgame/sound.c
@@ -49,36 +49,18 @@ static int num_sounds = 0, num_music = 0;
 /* ========================================================================= */
 /* 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[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
-#endif
-};
+static struct AudioFormatInfo afmt;
+static struct SoundControl mixer[NUM_MIXER_CHANNELS];
+static int mixer_active_channels = 0;
 
 /* forward declaration of internal functions */
-static void SoundServer_InsertNewSound(struct SoundControl);
 static void InitAudioDevice(struct AudioFormatInfo *);
+static void Mixer_Main(void);
 
-#if defined(PLATFORM_UNIX)
-#if !defined(AUDIO_STREAMING_DSP)
+#if defined(PLATFORM_UNIX) && !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);
-static void SoundServer_StopAllSounds();
-#endif
 
 static void ReloadCustomSounds();
 static void ReloadCustomMusic();
@@ -144,27 +126,27 @@ static boolean TestAudioDevices(void)
 #if !defined(TARGET_SDL)
 static boolean ForkAudioProcess(void)
 {
-  if (pipe(audio.soundserver_pipe) < 0)
+  if (pipe(audio.mixer_pipe) < 0)
   {
     Error(ERR_WARN, "cannot create pipe -- no sounds");
     return FALSE;
   }
 
-  if ((audio.soundserver_pid = fork()) < 0)
+  if ((audio.mixer_pid = fork()) < 0)
   {       
     Error(ERR_WARN, "cannot create sound server process -- no sounds");
     return FALSE;
   }
 
-  if (audio.soundserver_pid == 0)	/* we are child process */
+  if (audio.mixer_pid == 0)		/* we are child process */
   {
-    SoundServer();
+    Mixer_Main();
 
     /* never reached */
     exit(0);
   }
   else					/* we are parent */
-    close(audio.soundserver_pipe[0]); /* no reading from pipe needed */
+    close(audio.mixer_pipe[0]); 	/* no reading from pipe needed */
 
   return TRUE;
 }
@@ -182,6 +164,10 @@ void UnixOpenAudio(void)
   audio.music_available = TRUE;
   audio.loops_available = TRUE;
 #endif
+
+  audio.num_channels = NUM_MIXER_CHANNELS;
+  audio.music_channel = MUSIC_CHANNEL;
+  audio.first_sound_channel = FIRST_SOUND_CHANNEL;
 }
 
 void UnixCloseAudio(void)
@@ -189,61 +175,71 @@ void UnixCloseAudio(void)
   if (audio.device_fd)
     close(audio.device_fd);
 
-  if (audio.soundserver_pid > 0)	/* we are parent process */
-    kill(audio.soundserver_pid, SIGTERM);
+  if (audio.mixer_pid > 0)		/* we are parent process */
+    kill(audio.mixer_pid, SIGTERM);
 }
-#endif	/* PLATFORM_UNIX */
 
-void InitPlaylist(void)
+static void WriteSoundControlToPipe(struct SoundControl snd_ctrl)
 {
-  int i;
+  if (audio.mixer_pid == 0)		/* we are child process */
+    return;
 
-  for(i=0; i<NUM_MIXER_CHANNELS; i++)
-    playlist[i] = emptySoundControl;
-  playing_sounds = 0;
+  if (write(audio.mixer_pipe[1], &snd_ctrl, sizeof(struct SoundControl)) < 0)
+  {
+    Error(ERR_WARN, "cannot pipe to child process -- no sounds");
+    audio.sound_available = audio.sound_enabled = FALSE;
+    return;
+  }
 }
 
-#if 1
-static void PlaylistRemoveSound(int pos)
+static void ReadSoundControlFromPipe(struct SoundControl *snd_ctrl)
 {
-  if (!playing_sounds || !playlist[pos].active)
+  if (audio.mixer_pid != 0)		/* we are parent process */
     return;
 
-  playlist[pos] = emptySoundControl;
-  playing_sounds--;
+  if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(struct SoundControl))
+      != sizeof(struct SoundControl))
+    Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
 }
 
 static void WriteReloadInfoToPipe(char *set_name, int type)
 {
-  struct SoundControl snd_ctrl = emptySoundControl;
+  struct SoundControl snd_ctrl;
   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;
 
+  if (audio.mixer_pid == 0)		/* we are child process */
+    return;
+
+  if (leveldir_current == NULL)		/* should never happen */
+    Error(ERR_EXIT, "leveldir_current == NULL");
+
+  snd_ctrl.active = FALSE;
   snd_ctrl.state = type;
   snd_ctrl.data_len = strlen(set_name) + 1;
 
-  if (write(audio.soundserver_pipe[1], &snd_ctrl,
+  if (write(audio.mixer_pipe[1], &snd_ctrl,
 	    sizeof(snd_ctrl)) < 0 ||
-      write(audio.soundserver_pipe[1], set_name,
+      write(audio.mixer_pipe[1], set_name,
 	    snd_ctrl.data_len) < 0 ||
-      write(audio.soundserver_pipe[1], leveldir_current,
+      write(audio.mixer_pipe[1], leveldir_current,
 	    sizeof(TreeInfo)) < 0 ||
-      write(audio.soundserver_pipe[1], ti,
+      write(audio.mixer_pipe[1], ti,
 	    sizeof(TreeInfo)) < 0 ||
-      write(audio.soundserver_pipe[1], &str_size1,
+      write(audio.mixer_pipe[1], &str_size1,
 	    sizeof(unsigned long)) < 0 ||
-      write(audio.soundserver_pipe[1], &str_size2,
+      write(audio.mixer_pipe[1], &str_size2,
 	    sizeof(unsigned long)) < 0 ||
-      write(audio.soundserver_pipe[1], &str_size3,
+      write(audio.mixer_pipe[1], &str_size3,
 	    sizeof(unsigned long)) < 0 ||
-      write(audio.soundserver_pipe[1], leveldir_current->fullpath,
+      write(audio.mixer_pipe[1], leveldir_current->fullpath,
 	    str_size1) < 0 ||
-      write(audio.soundserver_pipe[1], ti->basepath,
+      write(audio.mixer_pipe[1], ti->basepath,
 	    str_size2) < 0 ||
-      write(audio.soundserver_pipe[1], ti->fullpath,
+      write(audio.mixer_pipe[1], ti->fullpath,
 	    str_size3) < 0)
   {
     Error(ERR_WARN, "cannot pipe to child process -- no sounds");
@@ -276,17 +272,17 @@ static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl)
   if (ti->fullpath != NULL)
     free(ti->fullpath);
 
-  if (read(audio.soundserver_pipe[0], set_name,
+  if (read(audio.mixer_pipe[0], set_name,
 	   snd_ctrl.data_len) != snd_ctrl.data_len ||
-      read(audio.soundserver_pipe[0], leveldir_current,
+      read(audio.mixer_pipe[0], leveldir_current,
 	   sizeof(TreeInfo)) != sizeof(TreeInfo) ||
-      read(audio.soundserver_pipe[0], ti,
+      read(audio.mixer_pipe[0], ti,
 	   sizeof(TreeInfo)) != sizeof(TreeInfo) ||
-      read(audio.soundserver_pipe[0], &str_size1,
+      read(audio.mixer_pipe[0], &str_size1,
 	   sizeof(unsigned long)) != sizeof(unsigned long) ||
-      read(audio.soundserver_pipe[0], &str_size2,
+      read(audio.mixer_pipe[0], &str_size2,
 	   sizeof(unsigned long)) != sizeof(unsigned long) ||
-      read(audio.soundserver_pipe[0], &str_size3,
+      read(audio.mixer_pipe[0], &str_size3,
 	   sizeof(unsigned long)) != sizeof(unsigned long))
     Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
 
@@ -294,11 +290,11 @@ static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl)
   ti->basepath = checked_calloc(str_size2);
   ti->fullpath = checked_calloc(str_size3);
 
-  if (read(audio.soundserver_pipe[0], leveldir_current->fullpath,
+  if (read(audio.mixer_pipe[0], leveldir_current->fullpath,
 	   str_size1) != str_size1 ||
-      read(audio.soundserver_pipe[0], ti->basepath,
+      read(audio.mixer_pipe[0], ti->basepath,
 	   str_size2) != str_size2 ||
-      read(audio.soundserver_pipe[0], ti->fullpath,
+      read(audio.mixer_pipe[0], ti->fullpath,
 	   str_size3) != str_size3)
     Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
 
@@ -307,15 +303,261 @@ static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl)
   else
     artwork.music_set_current = set_name;
 }
+#endif	/* PLATFORM_UNIX */
+
+void Mixer_InitChannels()
+{
+  int i;
+
+  for(i=0; i<audio.num_channels; i++)
+    mixer[i].active = FALSE;
+  mixer_active_channels = 0;
+}
+
+static void Mixer_PlayChannel(int channel)
+{
+#if defined(PLATFORM_MSDOS)
+  mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr);
+
+  if (mixer[channel].voice < 0)
+    return;
+
+  if (IS_LOOP(mixer[channel]))
+    voice_set_playmode(mixer[channel].voice, PLAYMODE_LOOP);
+
+  voice_set_volume(mixer[channel].voice, snd_ctrl.volume);
+  voice_set_pan(mixer[channel].voice, snd_ctrl.stereo);
+  voice_start(mixer[channel].voice);       
+#endif
+}
+
+static void Mixer_StopChannel(int channel)
+{
+#if defined(PLATFORM_MSDOS)
+  voice_set_volume(mixer[channel].voice, 0);
+  deallocate_voice(mixer[channel].voice);
+#endif
+}
+
+static void Mixer_FadeChannel(int channel)
+{
+  mixer[channel].state |= SND_CTRL_FADE;
+
+#if defined(PLATFORM_MSDOS)
+  if (voice_check(mixer[channel].voice))
+    voice_ramp_volume(mixer[channel].voice, 1000, 0);
+  mixer[channel].state &= ~SND_CTRL_IS_LOOP;
+#endif
+}
+
+static void Mixer_RemoveSound(int channel)
+{
+  if (!mixer_active_channels || !mixer[channel].active)
+    return;
+
+#if 0
+  printf("REMOVING MIXER SOUND %d\n", channel);
+#endif
+
+  Mixer_StopChannel(channel);
+
+  mixer[channel].active = FALSE;
+  mixer_active_channels--;
+}
+
+static void Mixer_InsertSound(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", mixer_active_channels);
+#endif
+
+  if (mixer_active_channels == audio.num_channels)
+  {
+    for (i=0; i<audio.num_channels; i++)
+    {
+      if (mixer[i].data_ptr == NULL)
+      {
+#if 1
+	printf("THIS SHOULD NEVER HAPPEN! [%d]\n", i);
+#endif
+
+	Mixer_RemoveSound(i);
+      }
+    }
+  }
+
+  /* if mixer is full, remove oldest sound */
+  if (mixer_active_channels == audio.num_channels)
+  {
+    int longest = 0, longest_nr = audio.first_sound_channel;
+
+    for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+    {
+#if !defined(PLATFORM_MSDOS)
+      int actual = 100 * mixer[i].playingpos / mixer[i].data_len;
+#else
+      int actual = mixer[i].playingpos;
+#endif
+
+      if (!IS_LOOP(mixer[i]) && actual > longest)
+      {
+	longest = actual;
+	longest_nr = i;
+      }
+    }
+
+    Mixer_RemoveSound(longest_nr);
+  }
+
+  /* check if sound is already being played (and how often) */
+  for (k=0, i=audio.first_sound_channel; i<audio.num_channels; i++)
+    if (mixer[i].nr == snd_ctrl.nr)
+      k++;
+
+  /* restart loop sounds only if they are just fading out */
+  if (k >= 1 && IS_LOOP(snd_ctrl))
+  {
+    for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+    {
+      if (mixer[i].nr == snd_ctrl.nr && IS_FADING(mixer[i]))
+      {
+	mixer[i].state &= ~SND_CTRL_FADE;
+	mixer[i].volume = PSND_MAX_VOLUME;
+#if defined(PLATFORM_MSDOS)
+        mixer[i].state |= SND_CTRL_LOOP;
+        voice_stop_volumeramp(mixer[i].voice);
+        voice_ramp_volume(mixer[i].voice, mixer[i].volume, 1000);
+#endif
+      }
+    }
+
+    return;
+  }
+
+  /* don't play sound more than n times simultaneously (with n == 2 for now) */
+  if (k >= 2)
+  {
+    int longest = 0, longest_nr = audio.first_sound_channel;
+
+    /* look for oldest equal sound */
+    for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+    {
+      int actual;
+
+      if (!mixer[i].active || mixer[i].nr != snd_ctrl.nr)
+	continue;
+
+#if !defined(PLATFORM_MSDOS)
+      actual = 100 * mixer[i].playingpos / mixer[i].data_len;
+#else
+      actual = mixer[i].playingpos;
+#endif
+      if (actual >= longest)
+      {
+	longest = actual;
+	longest_nr = i;
+      }
+    }
+
+    Mixer_RemoveSound(longest_nr);
+  }
+
+  /* add new sound to mixer */
+  for(i=0; i<audio.num_channels; i++)
+  {
+#if 0
+    printf("CHECKING CHANNEL %d FOR SOUND %d ...\n", i, snd_ctrl.nr);
+#endif
+
+    /*
+    if (!mixer[i].active ||
+	(IS_MUSIC(snd_ctrl) && i == audio.music_channel))
+    */
+    if ((i == audio.music_channel && IS_MUSIC(snd_ctrl)) ||
+	(i != audio.music_channel && !mixer[i].active))
+    {
+      snd_ctrl.data_ptr = snd_info->data_ptr;
+      snd_ctrl.data_len = snd_info->data_len;
+      snd_ctrl.format   = snd_info->format;
+
+      snd_ctrl.playingpos = 0;
+      snd_ctrl.playingtime = 0;
+
+#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 == audio.music_channel && mixer[i].active)
+      {
+	printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n");
+
+#if 1
+	Mixer_RemoveSound(i);
+#endif
+      }
+#endif
+
+      mixer[i] = snd_ctrl;
+      mixer_active_channels++;
+
+#if 0
+      printf("NEW SOUND %d ADDED TO MIXER\n", snd_ctrl.nr);
+#endif
+
+      Mixer_PlayChannel(i);
+
+      break;
+    }
+  }
+}
 
 static void HandleSoundRequest(struct SoundControl snd_ctrl)
 {
   int i;
 
+#if defined(PLATFORM_MSDOS)
+  for (i=0; i<audio.num_channels; i++)
+  {
+    if (!mixer[i].active || IS_LOOP(mixer[i]))
+      continue;
+
+    mixer[i].playingpos = voice_get_position(mixer[i].voice);
+    mixer[i].volume = voice_get_volume(mixer[i].voice);
+
+    if (mixer[i].playingpos == -1 || mixer[i].volume == 0)
+      Mixer_RemoveSound(i);
+  }
+#endif /* PLATFORM_MSDOS */
+
   if (IS_RELOADING(snd_ctrl))		/* load new sound or music files */
   {
     ReadReloadInfoFromPipe(snd_ctrl);
-    InitPlaylist();
+    Mixer_InitChannels();
     CloseAudioDevice(&audio.device_fd);
 
     if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS)
@@ -325,45 +567,44 @@ static void HandleSoundRequest(struct SoundControl snd_ctrl)
   }
   else if (IS_FADING(snd_ctrl))		/* fade out existing sound or music */
   {
-    if (!playing_sounds)
+    if (!mixer_active_channels)
       return;
 
     if (IS_MUSIC(snd_ctrl))
     {
-      playlist[MUSIC_CHANNEL].state |= SND_CTRL_FADE;
+      Mixer_FadeChannel(audio.music_channel);
       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;
+    for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+      if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+	Mixer_FadeChannel(i);
   }
   else if (IS_STOPPING(snd_ctrl))	/* stop existing sound or music */
   {
-    if (!playing_sounds)
+    if (!mixer_active_channels)
       return;
 
     if (IS_MUSIC(snd_ctrl))
     {
-      PlaylistRemoveSound(MUSIC_CHANNEL);
+      Mixer_RemoveSound(audio.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);
+    for(i=audio.first_sound_channel; i<audio.num_channels; i++)
+      if (mixer[i].nr == snd_ctrl.nr || ALL_SOUNDS(snd_ctrl))
+	Mixer_RemoveSound(i);
 
-    if (!playing_sounds)
+    if (!mixer_active_channels)
       CloseAudioDevice(&audio.device_fd);
   }
-  else if (snd_ctrl.active)		/* add new sound to playlist */
+  else if (snd_ctrl.active)		/* add new sound to mixer */
   {
-    SoundServer_InsertNewSound(snd_ctrl);
+    Mixer_InsertSound(snd_ctrl);
   }
 }
-#endif
 
-void StartSoundserver(void)
+void StartMixer(void)
 {
   if (!audio.sound_available)
     return;
@@ -394,7 +635,7 @@ static void CopySampleToMixingBuffer(struct SoundControl *snd_ctrl,
 }
 
 #if defined(AUDIO_STREAMING_DSP)
-static void SoundServer_Mixer()
+static void Mixer_Main_DSP()
 {
   static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1];
   static boolean stereo_volume_calculated = FALSE;
@@ -403,10 +644,10 @@ static void SoundServer_Mixer()
   static short premix_right_buffer[SND_BLOCKSIZE];
   static long premix_last_buffer[SND_BLOCKSIZE];
   static byte playing_buffer[SND_BLOCKSIZE];
+  boolean stereo;
+  int fragment_size;
+  int sample_bytes;
   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)
@@ -418,7 +659,7 @@ static void SoundServer_Mixer()
     stereo_volume_calculated = TRUE;
   }
 
-  if (!playing_sounds)
+  if (!mixer_active_channels)
     return;
 
   if (audio.device_fd < 0)
@@ -429,42 +670,45 @@ static void SoundServer_Mixer()
     InitAudioDevice(&afmt);
   }
 
+  stereo = afmt.stereo;
+  fragment_size = afmt.fragment_size;
+  sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2);
   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++)
+  for(i=0; i<audio.num_channels; i++)
   {
     void *sample_ptr;
     int sample_len;
     int sample_pos;
     int sample_size;
 
-    if (!playlist[i].active)
+    if (!mixer[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_ptr = mixer[i].data_ptr;
+    sample_len = mixer[i].data_len;
+    sample_pos = mixer[i].playingpos;
     sample_size = MIN(max_sample_size, sample_len - sample_pos);
-    playlist[i].playingpos += sample_size;
+    mixer[i].playingpos += sample_size;
 
     /* copy original sample to first mixing buffer */
-    CopySampleToMixingBuffer(&playlist[i], sample_pos, sample_size,
+    CopySampleToMixingBuffer(&mixer[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)
+    if (IS_LOOP(mixer[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)
+	if (mixer[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;
@@ -473,29 +717,29 @@ static void SoundServer_Mixer()
 	    premix_first_buffer[sample_size + j] =
 	      ((short *)sample_ptr)[j];
 
-	playlist[i].playingpos = restarted_sample_size;
+	mixer[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;
+    if (IS_FADING(mixer[i]) &&
+	mixer[i].volume >= SOUND_FADING_VOLUME_THRESHOLD)
+      mixer[i].volume -= SOUND_FADING_VOLUME_STEP;
 
     /* adjust volume of actual sound sample */
-    if (playlist[i].volume != PSND_MAX_VOLUME)
+    if (mixer[i].volume != PSND_MAX_VOLUME)
       for(j=0; j<sample_size; j++)
 	premix_first_buffer[j] =
-	  (playlist[i].volume * (long)premix_first_buffer[j])
+	  (mixer[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 left_volume = stereo_volume[middle_pos + mixer[i].stereo];
+      int right_volume= stereo_volume[middle_pos - mixer[i].stereo];
 
       for(j=0; j<sample_size; j++)
       {
@@ -516,16 +760,16 @@ static void SoundServer_Mixer()
 	premix_last_buffer[j] += premix_first_buffer[j];
     }
 
-    /* delete completed sound entries from the playlist */
-    if (playlist[i].playingpos >= playlist[i].data_len)
+    /* delete completed sound entries from the mixer */
+    if (mixer[i].playingpos >= mixer[i].data_len)
     {
-      if (IS_LOOP(playlist[i]))
-	playlist[i].playingpos = 0;
+      if (IS_LOOP(mixer[i]))
+	mixer[i].playingpos = 0;
       else
-	PlaylistRemoveSound(i);
+	Mixer_RemoveSound(i);
     }
-    else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
-      PlaylistRemoveSound(i);
+    else if (mixer[i].volume <= SOUND_FADING_VOLUME_THRESHOLD)
+      Mixer_RemoveSound(i);
   }
 
   /* prepare final playing buffer according to system audio format */
@@ -559,13 +803,13 @@ static void SoundServer_Mixer()
   /* finally play the sound fragment */
   write(audio.device_fd, playing_buffer, fragment_size);
 
-  if (!playing_sounds)
+  if (!mixer_active_channels)
     CloseAudioDevice(&audio.device_fd);
 }
 
 #else /* !AUDIO_STREAMING_DSP */
 
-static int SoundServer_SimpleAudio(struct SoundControl snd_ctrl)
+static int Mixer_Main_SimpleAudio(struct SoundControl snd_ctrl)
 {
   static short premix_first_buffer[SND_BLOCKSIZE];
   static byte playing_buffer[SND_BLOCKSIZE];
@@ -579,21 +823,21 @@ static int SoundServer_SimpleAudio(struct SoundControl snd_ctrl)
   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_ptr = mixer[i].data_ptr;
+  sample_len = mixer[i].data_len;
+  sample_pos = mixer[i].playingpos;
   sample_size = MIN(max_sample_size, sample_len - sample_pos);
-  playlist[i].playingpos += sample_size;
+  mixer[i].playingpos += sample_size;
 
   /* copy original sample to first mixing buffer */
-  CopySampleToMixingBuffer(&playlist[i], sample_pos, sample_size,
+  CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size,
 			   premix_first_buffer);
 
   /* adjust volume of actual sound sample */
-  if (playlist[i].volume != PSND_MAX_VOLUME)
+  if (mixer[i].volume != PSND_MAX_VOLUME)
     for(j=0; j<sample_size; j++)
       premix_first_buffer[j] =
-	(playlist[i].volume * (long)premix_first_buffer[j])
+	(mixer[i].volume * (long)premix_first_buffer[j])
 	  >> PSND_MAX_VOLUME_BITS;
 
   /* might be needed for u-law /dev/audio */
@@ -603,9 +847,9 @@ static int SoundServer_SimpleAudio(struct SoundControl snd_ctrl)
       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);
+  /* delete completed sound entries from the mixer */
+  if (mixer[i].playingpos >= mixer[i].data_len)
+    Mixer_RemoveSound(i);
 
   for(i=0; i<sample_size; i++)
     playing_buffer[i] = (premix_first_buffer[i] >> 8) ^ 0x80;
@@ -617,44 +861,44 @@ static int SoundServer_SimpleAudio(struct SoundControl snd_ctrl)
 }
 #endif /* !AUDIO_STREAMING_DSP */
 
-void SoundServer()
+void Mixer_Main()
 {
   struct SoundControl snd_ctrl;
-  fd_set sound_fdset;
+  fd_set mixer_fdset;
 
-  close(audio.soundserver_pipe[1]);	/* no writing into pipe needed */
+  close(audio.mixer_pipe[1]);	/* no writing into pipe needed */
 
-  InitPlaylist();
+  Mixer_InitChannels();
 
 #if defined(PLATFORM_HPUX)
   InitAudioDevice(&afmt);
 #endif
 
-  FD_ZERO(&sound_fdset); 
-  FD_SET(audio.soundserver_pipe[0], &sound_fdset);
+  FD_ZERO(&mixer_fdset); 
+  FD_SET(audio.mixer_pipe[0], &mixer_fdset);
 
   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))
+    FD_SET(audio.mixer_pipe[0], &mixer_fdset);
+    select(audio.mixer_pipe[0] + 1, &mixer_fdset, NULL, NULL, NULL);
+    if (!FD_ISSET(audio.mixer_pipe[0], &mixer_fdset))
       continue;
-    if (read(audio.soundserver_pipe[0], &snd_ctrl, sizeof(snd_ctrl))
-	!= sizeof(snd_ctrl))
-      Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
+
+    ReadSoundControlFromPipe(&snd_ctrl);
 
     HandleSoundRequest(snd_ctrl);
 
 #if defined(AUDIO_STREAMING_DSP)
 
-    while (playing_sounds && select(audio.soundserver_pipe[0] + 1,
-				    &sound_fdset, NULL, NULL, &delay) < 1)
+    while (mixer_active_channels &&
+	   select(audio.mixer_pipe[0] + 1,
+		  &mixer_fdset, NULL, NULL, &delay) < 1)
     {
-      FD_SET(audio.soundserver_pipe[0], &sound_fdset);
+      FD_SET(audio.mixer_pipe[0], &mixer_fdset);
 
-      SoundServer_Mixer();
+      Mixer_Main_DSP();
     }
 
 #else /* !AUDIO_STREAMING_DSP */
@@ -668,15 +912,16 @@ void SoundServer()
     delay.tv_sec = 0;
     delay.tv_usec = 0;
 
-    while (playing_sounds && select(audio.soundserver_pipe[0] + 1,
-				    &sound_fdset, NULL, NULL, &delay) < 1)
+    while (mixer_active_channels &&
+	   select(audio.mixer_pipe[0] + 1,
+		  &mixer_fdset, NULL, NULL, &delay) < 1)
     {
       int wait_percent = 90;	/* wait 90% of the real playing time */
       int sample_size;
 
-      FD_SET(audio.soundserver_pipe[0], &sound_fdset);
+      FD_SET(audio.mixer_pipe[0], &mixer_fdset);
 
-      sample_size = SoundServer_SimpleAudio(snd_ctrl);
+      sample_size = Mixer_Main_SimpleAudio(snd_ctrl);
 
       delay.tv_sec = 0;
       delay.tv_usec =
@@ -685,332 +930,13 @@ void SoundServer()
 
     CloseAudioDevice(&audio.device_fd);
 
-    /* delete all sounds from playlist */
-    InitPlaylist();
+    Mixer_InitChannels();	/* remove all sounds from mixer */
 
 #endif /* !AUDIO_STREAMING_DSP */
   }
 }
 #endif /* PLATFORM_UNIX */
 
-#if defined(PLATFORM_MSDOS)
-static void sound_handler(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].state &= ~SND_CTRL_IS_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);
-}
-#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 == NUM_MIXER_CHANNELS)
-  {
-    int longest = 0, longest_nr = 0;
-
-    for (i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
-    {
-#if !defined(PLATFORM_MSDOS)
-      int actual = 100 * playlist[i].playingpos / playlist[i].data_len;
-#else
-      int actual = playlist[i].playingpos;
-#endif
-
-      if (!IS_LOOP(playlist[i]) && actual > longest)
-      {
-	longest = actual;
-	longest_nr = i;
-      }
-    }
-#if defined(PLATFORM_MSDOS)
-    voice_set_volume(playlist[longest_nr].voice, 0);
-    deallocate_voice(playlist[longest_nr].voice);
-#endif
-    playlist[longest_nr] = emptySoundControl;
-    playing_sounds--;
-  }
-
-  /* check if sound is already being played (and how often) */
-  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 && IS_LOOP(snd_ctrl))
-  {
-    for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
-    {
-      if (playlist[i].nr == snd_ctrl.nr && IS_FADING(playlist[i]))
-      {
-	playlist[i].state &= ~SND_CTRL_FADE;
-	playlist[i].volume = PSND_MAX_VOLUME;
-#if defined(PLATFORM_MSDOS)
-        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)
-  {
-    int longest = 0, longest_nr = 0;
-
-    /* look for oldest equal sound */
-    for(i=FIRST_SOUND_CHANNEL; i<NUM_MIXER_CHANNELS; i++)
-    {
-      int actual;
-
-      if (!playlist[i].active || playlist[i].nr != snd_ctrl.nr)
-	continue;
-
-#if !defined(PLATFORM_MSDOS)
-      actual = 100 * playlist[i].playingpos / playlist[i].data_len;
-#else
-      actual = playlist[i].playingpos;
-#endif
-      if (actual >= longest)
-      {
-	longest = actual;
-	longest_nr = i;
-      }
-    }
-
-#if defined(PLATFORM_MSDOS)
-    voice_set_volume(playlist[longest_nr].voice, 0);
-    deallocate_voice(playlist[longest_nr].voice);
-#endif
-    playlist[longest_nr] = emptySoundControl;
-    playing_sounds--;
-  }
-
-  /* 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 ||
-	(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((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);       
-#endif
-      break;
-    }
-  }
-}
-#endif /* !PLATFORM_WIN32 */
-
-/*
-void SoundServer_FadeSound(int nr)
-{
-  int i;
-
-  if (!playing_sounds)
-    return;
-
-  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;
-}
-*/
-
-#if !defined(PLATFORM_WIN32)
-#if defined(PLATFORM_MSDOS)
-static void SoundServer_StopSound(struct SoundControl snd_ctrl)
-{
-  int nr = snd_ctrl.nr;
-  int i;
-
-  if (!playing_sounds)
-    return;
-
-  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);
-      deallocate_voice(playlist[i].voice);
-#endif
-      playlist[i] = emptySoundControl;
-      playing_sounds--;
-    }
-  }
-
-#if !defined(PLATFORM_MSDOS)
-  if (!playing_sounds)
-    close(audio.device_fd);
-#endif
-}
-
-static void SoundServer_StopAllSounds()
-{
-  int 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;
-  }
-  playing_sounds = 0;
-
-#if !defined(PLATFORM_MSDOS)
-  close(audio.device_fd);
-#endif
-}
-#endif /* PLATFORM_MSDOS */
-#endif /* !PLATFORM_WIN32 */
-
 
 /* ------------------------------------------------------------------------- */
 /* platform dependant audio initialization code                              */
@@ -1152,6 +1078,11 @@ static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt)
 #if defined(PLATFORM_UNIX)
 static void InitAudioDevice(struct AudioFormatInfo *afmt)
 {
+  afmt->stereo = TRUE;
+  afmt->format = AUDIO_FORMAT_UNKNOWN;
+  afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE;
+  afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE;
+
 #if defined(AUDIO_LINUX_IOCTL)
   InitAudioDevice_Linux(afmt);
 #elif defined(PLATFORM_NETBSD)
@@ -1629,7 +1560,7 @@ void PlaySoundMusic(int nr)
 
 void PlaySoundExt(int nr, int volume, int stereo, int state)
 {
-  struct SoundControl snd_ctrl = emptySoundControl;
+  struct SoundControl snd_ctrl;
 
   if (!audio.sound_available ||
       !audio.sound_enabled ||
@@ -1659,17 +1590,13 @@ void PlaySoundExt(int nr, int volume, int stereo, int state)
     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;
 
-  if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
-  {
-    Error(ERR_WARN, "cannot pipe to child process -- no sounds");
-    audio.sound_available = audio.sound_enabled = FALSE;
-    return;
-  }
+  WriteSoundControlToPipe(snd_ctrl);
+
 #elif defined(PLATFORM_MSDOS)
-  sound_handler(snd_ctrl);
+
+  HandleSoundRequest(snd_ctrl);
+
 #endif
 }
 
@@ -1723,13 +1650,14 @@ void StopSounds()
 
 void StopSoundExt(int nr, int state)
 {
-  struct SoundControl snd_ctrl = emptySoundControl;
+  struct SoundControl snd_ctrl;
 
   if (!audio.sound_available)
     return;
 
-  snd_ctrl.nr    = nr;
-  snd_ctrl.state = state;
+  snd_ctrl.active = FALSE;
+  snd_ctrl.nr     = nr;
+  snd_ctrl.state  = state;
 
 #if defined(TARGET_SDL)
 
@@ -1737,6 +1665,10 @@ void StopSoundExt(int nr, int state)
   {
     int i;
 
+    /*
+    for (i=audio.first_sound_channel; i<audio.num_channels; i++)
+    */
+
     for (i=0; i<audio.channels; i++)
       if (i != audio.music_channel || snd_ctrl.music)
 	Mix_FadeOutChannel(i, SOUND_FADING_INTERVAL);
@@ -1756,17 +1688,12 @@ void StopSoundExt(int nr, int state)
 
 #elif !defined(PLATFORM_MSDOS)
 
-  if (audio.soundserver_pid == 0)	/* we are child process */
-    return;
+  WriteSoundControlToPipe(snd_ctrl);
 
-  if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0)
-  {
-    Error(ERR_WARN, "cannot pipe to child process -- no sounds");
-    audio.sound_available = audio.sound_enabled = FALSE;
-    return;
-  }
 #else /* PLATFORM_MSDOS */
-  sound_handler(snd_ctrl);
+
+  HandleSoundRequest(snd_ctrl);
+
 #endif
 }
 
@@ -1921,79 +1848,28 @@ static void ReloadCustomMusic()
   LoadCustomMusic();
 }
 
-static void InitReloadSoundsOrMusic(char *set_name, int type)
+void InitReloadSounds(char *set_name)
 {
-#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;
 
 #if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
-  if (type == SND_CTRL_RELOAD_SOUNDS)
-    ReloadCustomSounds();
-  else
-    ReloadCustomMusic();
+  ReloadCustomSounds();
 #elif defined(PLATFORM_UNIX)
-  if (audio.soundserver_pid == 0)	/* we are child process */
-    return;
-
-  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;
-  }
-#endif
-
+  WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_SOUNDS);
 #endif
 }
 
-void InitReloadSounds(char *set_name)
-{
-  InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_SOUNDS);
-}
-
 void InitReloadMusic(char *set_name)
 {
-  InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_MUSIC);
+  if (!audio.music_available)
+    return;
+
+#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
+  ReloadCustomMusic();
+#elif defined(PLATFORM_UNIX)
+  WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_MUSIC);
+#endif
 }
 
 void FreeSound(void *ptr)
@@ -2050,7 +1926,7 @@ void FreeAllSounds()
     return;
 
   printf("%s: FREEING SOUNDS ...\n",
-	 audio.soundserver_pid == 0 ? "CHILD" : "PARENT");
+	 audio.mixer_pid == 0 ? "CHILD" : "PARENT");
 
   for(i=0; i<num_sounds; i++)
     deleteSoundEntry(&Sound[i]);
@@ -2059,7 +1935,7 @@ void FreeAllSounds()
   */
 
   printf("%s: FREEING SOUNDS -- DONE\n",
-	 audio.soundserver_pid == 0 ? "CHILD" : "PARENT");
+	 audio.mixer_pid == 0 ? "CHILD" : "PARENT");
 
   free(Sound);