rnd-20020428-3-src
[rocksndiamonds.git] / src / libgame / sound.c
index 57e61c7093f37c939a99e29f614c78dad6de4f59..61644cda859874bddb68ce813da558ddb0174aa6 100644 (file)
 static SoundInfo **Sound = NULL;
 static MusicInfo **Music = NULL;
 static int num_sounds = 0, num_music = 0;
+static char **sound_name;
 
 
 /* ========================================================================= */
 /* 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 emptySoundControl =
@@ -40,36 +46,35 @@ static struct SoundControl emptySoundControl =
 };
 
 #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(SoundInfo *);
+
 #if defined(PLATFORM_UNIX)
 static int OpenAudioDevice(char *audio_device_name)
 {
@@ -209,7 +214,7 @@ void SoundServer(void)
       (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); 
@@ -233,27 +238,16 @@ void SoundServer(void)
       TreeInfo *ti = *ti_ptr;
       unsigned long str_size1, str_size2, str_size3;
 
-      printf("B\n");
-
       if (leveldir_current == NULL)
        leveldir_current = checked_calloc(sizeof(TreeInfo));
-      printf("B.1\n");
       if (ti == NULL)
        ti = *ti_ptr = checked_calloc(sizeof(TreeInfo));
-      printf("B.2\n");
       if (leveldir_current->fullpath != NULL)
        free(leveldir_current->fullpath);
-      printf("B.3 ['%s']\n", ti->basepath);
-#if 0
       if (ti->basepath != NULL)
        free(ti->basepath);
-#endif
-      printf("B.4\n");
       if (ti->fullpath != NULL)
        free(ti->fullpath);
-      printf("B.5\n");
-
-      printf("C\n");
 
       if (read(audio.soundserver_pipe[0], set_name,
               snd_ctrl.data_len) != snd_ctrl.data_len ||
@@ -269,8 +263,6 @@ void SoundServer(void)
               sizeof(unsigned long)) != sizeof(unsigned long))
        Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
 
-      printf("D\n");
-
       leveldir_current->fullpath = checked_calloc(str_size1);
       ti->basepath = checked_calloc(str_size2);
       ti->fullpath = checked_calloc(str_size3);
@@ -283,23 +275,25 @@ void SoundServer(void)
               str_size3) != str_size3)
        Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds");
 
-      printf("E\n");
-
       InitPlaylist();
 
       close(audio.device_fd);
 
-      printf("X\n");
-
       if (snd_ctrl.reload_sounds)
       {
        artwork.sounds_set_current = set_name;
+       ReloadCustomSounds();
+#if 0
        audio.func_reload_sounds();
+#endif
       }
       else
       {
        artwork.music_set_current = set_name;
+       ReloadCustomMusic();
+#if 0
        audio.func_reload_music();
+#endif
       }
 
       free(set_name);
@@ -359,26 +353,13 @@ void SoundServer(void)
 
     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);
@@ -387,34 +368,67 @@ void SoundServer(void)
               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<MAX_SOUNDS_PLAYING; 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)
            {
-             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 */
@@ -426,32 +440,33 @@ void SoundServer(void)
            if (playlist[i].volume != PSND_MAX_VOLUME)
              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++)
              {
                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 */
@@ -472,15 +487,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 */
@@ -713,12 +745,13 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
 
       snd_ctrl.data_ptr = snd_info->data_ptr;
       snd_ctrl.data_len = snd_info->data_len;
+      snd_ctrl.format   = snd_info->format;
 
       playlist[i] = snd_ctrl;
       playing_sounds++;
 
 #if defined(PLATFORM_MSDOS)
-      playlist[i].voice = allocate_voice(playlist[i].data_ptr);
+      playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr);
 
       if (snd_ctrl.loop)
         voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP);
@@ -804,16 +837,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
@@ -829,36 +877,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;
@@ -870,23 +925,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;
@@ -904,12 +961,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"... :) */
@@ -1039,6 +1111,10 @@ static SoundInfo *Load_WAV(char *filename)
   if (!audio.sound_available)
     return NULL;
 
+#if 1
+  printf("loading WAV file '%s'\n", filename);
+#endif
+
   snd_info = checked_calloc(sizeof(SoundInfo));
 
 #if defined(TARGET_SDL)
@@ -1132,8 +1208,7 @@ static SoundInfo *Load_WAV(char *filename)
     return NULL;
   }
 
-  for (i=0; i<snd_info->data_len; i++)
-    ((byte *)snd_info->data_ptr)[i] = ((byte *)snd_info->data_ptr)[i] ^ 0x80;
+  snd_info->format = AUDIO_FORMAT_U8;
 
 #endif /* PLATFORM_UNIX */
 
@@ -1143,24 +1218,37 @@ static SoundInfo *Load_WAV(char *filename)
   return snd_info;
 }
 
-SoundInfo *LoadCustomSound(char *basename)
+static void LoadCustomSound(SoundInfo **snd_info, char *basename)
 {
   char *filename = getCustomSoundFilename(basename);
 
-  if (filename == NULL)
+  if (filename == NULL)                /* (should never happen) */
   {
     Error(ERR_WARN, "cannot find sound file '%s'", basename);
-    return FALSE;
+    return;
   }
 
-  printf("-> '%s'\n", filename);
+  if (*snd_info && strcmp(filename, (*snd_info)->source_filename) == 0)
+  {
+    /* 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. */
+
+    return;
+  }
 
-  return Load_WAV(filename);
+  if (*snd_info)
+    FreeSound(*snd_info);
+
+  *snd_info = Load_WAV(filename);
 }
 
-void InitSoundList(int num_list_entries)
+void InitSoundList(char *sound_name_list[], int num_list_entries)
 {
-  Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *));
+  if (Sound == NULL)
+    Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *));
+
+  sound_name = sound_name_list;
   num_sounds = num_list_entries;
 }
 
@@ -1169,10 +1257,7 @@ void LoadSoundToList(char *basename, int list_pos)
   if (Sound == NULL || list_pos >= num_sounds)
     return;
 
-  if (Sound[list_pos])
-    FreeSound(Sound[list_pos]);
-
-  Sound[list_pos] = LoadCustomSound(basename);
+  LoadCustomSound(&Sound[list_pos], basename);
 }
 
 static MusicInfo *Load_MOD(char *filename)
@@ -1223,9 +1308,9 @@ void LoadCustomMusic(void)
     char *filename = getPath2(music_directory, basename);
     MusicInfo *mus_info = NULL;
 
-    if (FileIsSound(filename))
+    if (FileIsSound(basename))
       mus_info = Load_WAV(filename);
-    else if (FileIsMusic(filename))
+    else if (FileIsMusic(basename))
       mus_info = Load_MOD(filename);
 
     free(filename);
@@ -1252,6 +1337,8 @@ void PlayMusic(int nr)
 
 #if defined(TARGET_SDL)
 
+  nr = nr % num_music;
+
   if (Music[nr]->type == MUS_TYPE_MOD)
   {
     Mix_PlayMusic(Music[nr]->data_ptr, -1);
@@ -1317,6 +1404,7 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type)
   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
@@ -1446,34 +1534,61 @@ void StopSoundExt(int nr, int method)
 #endif
 }
 
+static void ReloadCustomSounds()
+{
+  int i;
+
+#if 1
+  printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current);
+#endif
+
+  LoadSoundsInfo();
+
+  for(i=0; i<num_sounds; i++)
+    LoadSoundToList(sound_name[i], i);
+}
+
+static void ReloadCustomMusic()
+{
+#if 1
+  printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current);
+#endif
+
+  FreeAllMusic();
+
+  LoadCustomMusic();
+}
+
 static void InitReloadSoundsOrMusic(char *set_name, int type)
 {
+#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL)
   struct SoundControl snd_ctrl = emptySoundControl;
   TreeInfo *ti =
     (type == SND_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
 
   if (!audio.sound_available)
     return;
 
-  if (leveldir_current == NULL)
-    Error(ERR_EXIT, "leveldir_current == NULL");
-
-  snd_ctrl.reload_sounds = (type == SND_RELOAD_SOUNDS);
-  snd_ctrl.reload_music  = (type == SND_RELOAD_MUSIC);
-  snd_ctrl.data_len = strlen(set_name) + 1;
-
 #if defined(TARGET_SDL) || defined(TARGET_ALLEGRO)
   if (type == SND_RELOAD_SOUNDS)
-    audio.audio.func_reload_sounds();
+    audio.func_reload_sounds();
   else
-    audio.audio.func_reload_music();
+    audio.func_reload_music();
 #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");
+
+  snd_ctrl.reload_sounds = (type == SND_RELOAD_SOUNDS);
+  snd_ctrl.reload_music  = (type == SND_RELOAD_MUSIC);
+  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,
@@ -1499,9 +1614,6 @@ static void InitReloadSoundsOrMusic(char *set_name, int type)
     audio.sound_available = audio.sound_enabled = FALSE;
     return;
   }
-
-  printf("A\n");
-
 #endif
 }
 
@@ -1567,7 +1679,9 @@ void FreeAllSounds()
     FreeSound(Sound[i]);
 
   free(Sound);
+
   Sound = NULL;
+  num_sounds = 0;
 }
 
 void FreeAllMusic()
@@ -1581,7 +1695,9 @@ void FreeAllMusic()
     FreeMusic(Music[i]);
 
   free(Music);
+
   Music = NULL;
+  num_music = 0;
 }
 
 /* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS                          */