X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fsound.c;h=d302b0e7a9036b6c8c5d2ecbcd277e81d0c93929;hb=a8b2caa1d373c84c1b3fc2f615370c2a319051ca;hp=b3818acb722fa9f8d1d1ebe24ffd71a9a3c8c5ad;hpb=19e168a132d1c0543a13cbf9495f579c137dea94;p=rocksndiamonds.git

diff --git a/src/sound.c b/src/sound.c
index b3818acb..d302b0e7 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -14,37 +14,91 @@
 #include "sound.h"
 #include "misc.h"
 
-#ifdef MSDOS
-extern void sound_handler(struct SoundControl);
-#endif
-
 /*** THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/
 
-#ifndef MSDOS
+static int playing_sounds = 0;
 static struct SoundControl playlist[MAX_SOUNDS_PLAYING];
 static struct SoundControl emptySoundControl =
 {
   -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL
 };
+
+#if !defined(MSDOS) && !defined(WIN32)
 static int stereo_volume[PSND_MAX_LEFT2RIGHT+1];
 static char premix_first_buffer[SND_BLOCKSIZE];
 #ifdef VOXWARE
 static char premix_left_buffer[SND_BLOCKSIZE];
 static char premix_right_buffer[SND_BLOCKSIZE];
 static int premix_last_buffer[SND_BLOCKSIZE];
-#endif
+#endif /* VOXWARE */
 static unsigned char playing_buffer[SND_BLOCKSIZE];
-static int playing_sounds = 0;
-#else
-struct SoundControl playlist[MAX_SOUNDS_PLAYING];
-struct SoundControl emptySoundControl;
-int playing_sounds;
+#endif /* !MSDOS && !WIN32 */
+
+/* forward declaration of internal functions */
+#ifdef VOXWARE
+static void SoundServer_InsertNewSound(struct SoundControl);
+#endif
+
+#if !defined(VOXWARE) && !defined(MSDOS) && !defined(WIN32)
+static unsigned char linear_to_ulaw(int);
+static int ulaw_to_linear(unsigned char);
+#endif
+
+#ifdef HPUX_AUDIO
+static void HPUX_Audio_Control();
+#endif
+
+#ifdef MSDOS
+static void SoundServer_InsertNewSound(struct SoundControl);
+static void SoundServer_StopSound(int);
+static void SoundServer_StopAllSounds();
 #endif
 
+int OpenAudio(char *audio_device_name)
+{
+  int audio_fd;
+
+  /* try to open audio device in non-blocking mode */
+  if ((audio_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0)
+    return audio_fd;
+
+  /* re-open audio device in blocking mode */
+  close(audio_fd);
+  audio_fd = open(audio_device_name, O_WRONLY);
+
+  return audio_fd;
+}
+
+int CheckAudio(char *audio_device_name)
+{
+  int audio_fd;
+
+  if (access(audio_device_name, W_OK) != 0)
+  {
+    Error(ERR_WARN, "cannot access audio device - no sound");
+    return SOUND_OFF;
+  }
+
+  if ((audio_fd = OpenAudio(sound_device_name)) < 0)
+  {
+    Error(ERR_WARN, "cannot open audio device - no sound");
+    return SOUND_OFF;
+  }
+
+  close(audio_fd);
+
+  return SOUND_AVAILABLE;
+}
+
+boolean UnixInitAudio(void)
+{
+  return TRUE;
+}
+
 void SoundServer()
 {
   int i;
-#ifndef MSDOS
+#if !defined(MSDOS) && !defined(WIN32)
   struct SoundControl snd_ctrl;
   fd_set sound_fdset;
 
@@ -55,7 +109,7 @@ void SoundServer()
     playlist[i] = emptySoundControl;
   playing_sounds = 0;
 
-#ifndef MSDOS
+#if !defined(MSDOS) && !defined(WIN32)
   stereo_volume[PSND_MAX_LEFT2RIGHT] = 0;
   for(i=0;i<PSND_MAX_LEFT2RIGHT;i++)
     stereo_volume[i] =
@@ -68,7 +122,7 @@ void SoundServer()
   FD_ZERO(&sound_fdset); 
   FD_SET(sound_pipe[0], &sound_fdset);
 
-  for(;;)	/* wait for calls from PlaySound(), StopSound(), ... */
+  while(1)	/* wait for sound playing commands from client */
   {
     FD_SET(sound_pipe[0], &sound_fdset);
     select(sound_pipe[0]+1, &sound_fdset, NULL, NULL, NULL);
@@ -118,24 +172,56 @@ void SoundServer()
     if (playing_sounds || snd_ctrl.active)
     {
       struct timeval delay = { 0, 0 };
-      char *sample_ptr;
-      long sample_size, max_sample_size;
-      long fragment_size;
-      boolean stereo;
+      byte *sample_ptr;
+      long sample_size;
+      static long max_sample_size = 0;
+      static long fragment_size = 0;
+      /* Even if the stereo flag is used as being boolean, it must be
+	 defined as an integer, else 'ioctl()' will fail! */
+      int stereo = TRUE;
+#if 0
+      int sample_rate = 8000;
+#else
+      int sample_rate = 22050;
+#endif
 
-      if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
+      if (playing_sounds ||
+	  (sound_device = OpenAudio(sound_device_name)) >= 0)
       {
 	if (!playing_sounds)	/* we just opened the audio device */
 	{
 	  /* 2 buffers / 512 bytes, giving 1/16 second resolution */
 	  /* (with stereo the effective buffer size will shrink to 256) */
 	  fragment_size = 0x00020009;
-	  ioctl(sound_device, SNDCTL_DSP_SETFRAGMENT, &fragment_size);
+
+	  if (ioctl(sound_device, SNDCTL_DSP_SETFRAGMENT, &fragment_size) < 0)
+	    Error(ERR_EXIT_SOUND_SERVER,
+		  "cannot set fragment size of /dev/dsp - no sounds");
+
 	  /* try if we can use stereo sound */
-	  stereo = TRUE;
-	  ioctl(sound_device, SNDCTL_DSP_STEREO, &stereo);
+	  if (ioctl(sound_device, SNDCTL_DSP_STEREO, &stereo) < 0)
+	  {
+#ifdef DEBUG
+	    static boolean reported = FALSE;
+
+	    if (!reported)
+	    {
+	      Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp");
+	      reported = TRUE;
+	    }
+#endif
+	    stereo = FALSE;
+	  }
+
+	  if (ioctl(sound_device, SNDCTL_DSP_SPEED, &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 */
-	  ioctl(sound_device, SNDCTL_DSP_GETBLKSIZE, &fragment_size);
+	  if (ioctl(sound_device, SNDCTL_DSP_GETBLKSIZE, &fragment_size) < 0)
+	    Error(ERR_EXIT_SOUND_SERVER,
+		  "cannot get fragment size of /dev/dsp - no sounds");
+
 	  max_sample_size = fragment_size / (stereo ? 2 : 1);
 	}
 
@@ -251,18 +337,18 @@ void SoundServer()
       }
     }
 
-#else	/* von '#ifdef VOXWARE' */
+#else /* !VOXWARE */
 
     if (snd_ctrl.active && !snd_ctrl.loop)
     {
       struct timeval delay = { 0, 0 };
-      char *sample_ptr;
+      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;
 
-      if ((sound_device=open(sound_device_name,O_WRONLY))>=0)
+      if ((sound_device = OpenAudio(sound_device_name)) >= 0)
       {
 	playing_sounds = 1;
 
@@ -272,9 +358,9 @@ void SoundServer()
 	  FD_SET(sound_pipe[0], &sound_fdset);
 
 	  /* get pointer and size of the actual sound sample */
-	  sample_ptr = snd_ctrl.data_ptr+snd_ctrl.playingpos;
+	  sample_ptr = snd_ctrl.data_ptr + snd_ctrl.playingpos;
 	  sample_size =
-	    MIN(max_sample_size,snd_ctrl.data_len-snd_ctrl.playingpos);
+	    MIN(max_sample_size, snd_ctrl.data_len - snd_ctrl.playingpos);
 	  snd_ctrl.playingpos += sample_size;
 
 	  /* fill the first mixing buffer with original sample */
@@ -305,17 +391,73 @@ void SoundServer()
       }
     }
 
-#endif	/* von '#ifdef VOXWARE' */
+#endif /* !VOXWARE */
 
   }
-#endif
+
+#endif /* !MSDOS && !WIN32 */
+
 }
 
-void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
+#ifdef MSDOS
+static void sound_handler(struct SoundControl snd_ctrl)
 {
-  int i,k;
+  int i;
 
-  /* wenn voll, ältesten Sound 'rauswerfen */
+  if (snd_ctrl.fade_sound)
+  {
+    if (!playing_sounds)
+      return;
+
+    for (i=0; i<MAX_SOUNDS_PLAYING; i++)
+      if ((snd_ctrl.stop_all_sounds || playlist[i].nr == snd_ctrl.nr) &&
+	  !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.nr);
+  }
+
+  for (i=0; i<MAX_SOUNDS_PLAYING; 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 /* MSDOS */
+
+#ifndef WIN32
+static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
+{
+  int i, k;
+
+  /* if playlist is full, remove oldest sound */
   if (playing_sounds==MAX_SOUNDS_PLAYING)
   {
     int longest=0, longest_nr=0;
@@ -342,14 +484,14 @@ void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
     playing_sounds--;
   }
 
-  /* nachsehen, ob (und ggf. wie oft) Sound bereits gespielt wird */
+  /* check if sound is already being played (and how often) */
   for(k=0,i=0;i<MAX_SOUNDS_PLAYING;i++)
   {
     if (playlist[i].nr == snd_ctrl.nr)
       k++;
   }
 
-  /* falls Sound-Loop: nur neu beginnen, wenn Sound gerade ausklingt */
+  /* restart loop sounds only if they are just fading out */
   if (k>=1 && snd_ctrl.loop)
   {
     for(i=0;i<MAX_SOUNDS_PLAYING;i++)
@@ -368,12 +510,12 @@ void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
     return;
   }
 
-  /* keinen Sound mehr als n mal gleichzeitig spielen (momentan n==2) */
+  /* don't play sound more than n times simultaneously (with n == 2 for now) */
   if (k>=2)
   {
     int longest=0, longest_nr=0;
 
-    /* den bereits am längsten gespielten (gleichen) Sound suchen */
+    /* look for oldest equal sound */
     for(i=0;i<MAX_SOUNDS_PLAYING;i++)
     {
       int actual;
@@ -419,6 +561,7 @@ void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
     }
   }
 }
+#endif /* !WIN32 */
 
 /*
 void SoundServer_FadeSound(int nr)
@@ -434,7 +577,9 @@ void SoundServer_FadeSound(int nr)
 }
 */
 
-void SoundServer_StopSound(int nr)
+#ifndef WIN32
+#ifdef MSDOS
+static void SoundServer_StopSound(int nr)
 {
   int i;
 
@@ -458,7 +603,7 @@ void SoundServer_StopSound(int nr)
 #endif
 }
 
-void SoundServer_StopAllSounds()
+static void SoundServer_StopAllSounds()
 {
   int i;
 
@@ -476,9 +621,11 @@ void SoundServer_StopAllSounds()
   close(sound_device);
 #endif
 }
+#endif /* MSDOS */
+#endif /* !WIN32 */
 
 #ifdef HPUX_AUDIO
-void HPUX_Audio_Control()
+static void HPUX_Audio_Control()
 {
   struct audio_describe ainfo;
   int audio_ctl;
@@ -500,6 +647,8 @@ void HPUX_Audio_Control()
 }
 #endif /* HPUX_AUDIO */
 
+#if !defined(VOXWARE) && !defined(MSDOS) && !defined(WIN32)
+
 /* these two are stolen from "sox"... :) */
 
 /*
@@ -527,7 +676,7 @@ void HPUX_Audio_Control()
 #define BIAS 0x84   /* define the add-in bias for 16 bit samples */
 #define CLIP 32635
 
-unsigned char linear_to_ulaw(int sample)
+static unsigned char linear_to_ulaw(int sample)
 {
   static int exp_lut[256] =
   {
@@ -588,7 +737,7 @@ unsigned char linear_to_ulaw(int sample)
 ** Output: signed 16 bit linear sample
 */
 
-int ulaw_to_linear(unsigned char ulawbyte)
+static int ulaw_to_linear(unsigned char ulawbyte)
 {
   static int exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 };
   int sign, exponent, mantissa, sample;
@@ -603,6 +752,7 @@ int ulaw_to_linear(unsigned char ulawbyte)
 
   return(sample);
 }
+#endif /* !VOXWARE && !MSDOS && !WIN32 */
 
 /*** THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/
 
@@ -610,196 +760,107 @@ int ulaw_to_linear(unsigned char ulawbyte)
 
 /*** THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS ***/
 
-static unsigned long be2long(unsigned long *be)	/* big-endian -> longword */
-{
-  unsigned char *ptr = (unsigned char *)be;
-
-  return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]);
-}
-
-static unsigned long le2long(unsigned long *be)	/* little-endian -> longword */
-{
-  unsigned char *ptr = (unsigned char *)be;
-
-  return(ptr[3]<<24 | ptr[2]<<16 | ptr[1]<<8 | ptr[0]);
-}
+#define CHUNK_ID_LEN            4       /* IFF style chunk id length */
+#define WAV_HEADER_SIZE		20	/* size of WAV file header */
 
 boolean LoadSound(struct SoundInfo *snd_info)
 {
-  FILE *file;
   char filename[256];
   char *sound_ext = "wav";
-  struct SoundHeader_WAV *sound_header;
+#ifndef TARGET_SDL
+#ifndef MSDOS
+  byte sound_header_buffer[WAV_HEADER_SIZE];
+  char chunk[CHUNK_ID_LEN + 1];
+  int chunk_length, dummy;
+  FILE *file;
   int i;
+#endif
+#endif
 
   sprintf(filename, "%s/%s/%s.%s",
-	  options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
+	  options.ro_base_directory, SOUNDS_DIRECTORY,
+	  snd_info->name, sound_ext);
 
-#ifndef MSDOS
-  if ((file = fopen(filename, "r")) == NULL)
-  {
-    Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
-    return(FALSE);
-  }
+#ifdef TARGET_SDL
 
-  if (fseek(file, 0, SEEK_END) < 0)
+  snd_info->mix_chunk = Mix_LoadWAV(filename);
+  if (snd_info->mix_chunk == NULL)
   {
     Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
-    fclose(file);
-    return(FALSE);
+    return FALSE;
   }
 
-  snd_info->file_len = ftell(file);
-  rewind(file);
+#else /* !TARGET_SDL */
 
-  snd_info->file_ptr = checked_malloc(snd_info->file_len);
+#ifndef MSDOS
 
-  if (fread(snd_info->file_ptr, 1, snd_info->file_len, file) !=
-      snd_info->file_len)
+  if ((file = fopen(filename, "r")) == NULL)
   {
-    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
-    fclose(file);
-    return(FALSE);
+    Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
+    return FALSE;
   }
 
-  fclose(file);
-
-  sound_header = (struct SoundHeader_WAV *)snd_info->file_ptr;
-
-  if (strncmp(sound_header->magic_RIFF, "RIFF", 4) ||
-      snd_info->file_len != le2long(&sound_header->header_size) + 8 ||
-      strncmp(sound_header->magic_WAVE, "WAVE", 4) ||
-      strncmp(sound_header->magic_DATA, "data", 4) ||
-      snd_info->file_len != le2long(&sound_header->data_size) + 44)
+  /* read chunk "RIFF" */
+  getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+  if (strcmp(chunk, "RIFF") != 0)
   {
-    Error(ERR_WARN, "'%s' is not a RIFF/WAVE file or broken - no sounds",
-	  filename);
-    return(FALSE);
-  }
-
-  snd_info->data_ptr = snd_info->file_ptr + 44;
-  snd_info->data_len = le2long(&sound_header->data_size);
-
-  for (i=0; i<snd_info->data_len; i++)
-    snd_info->data_ptr[i] = snd_info->data_ptr[i]^0x80;
-
-#else
-
-  snd_info->sample_ptr = load_sample(filename);
-  if (!snd_info->sample_ptr)
-  {
-    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename);
     fclose(file);
-    return(FALSE);
+    return FALSE;
   }
-#endif /* MSDOS */
-
-  return(TRUE);
-}
 
-boolean LoadSound_8SVX(struct SoundInfo *snd_info)
-{
-  FILE *file;
-  char filename[256];
-#ifndef MSDOS
-  char *sound_ext = "8svx";
-#else
-  char *sound_ext = "wav";
-#endif
-  struct SoundHeader_8SVX *sound_header;
-  unsigned char *ptr;
-
-  sprintf(filename, "%s/%s/%s.%s",
-	  options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
-
-#ifndef MSDOS
-  if (!(file=fopen(filename,"r")))
+  /* read chunk "WAVE" */
+  getFileChunk(file, chunk, &dummy, BYTE_ORDER_LITTLE_ENDIAN);
+  if (strcmp(chunk, "WAVE") != 0)
   {
-    Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
-    return(FALSE);
-  }
-
-  if (fseek(file,0,SEEK_END)<0)
-  {
-    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "missing 'WAVE' chunk of sound file '%s'", filename);
     fclose(file);
-    return(FALSE);
+    return FALSE;
   }
 
-  snd_info->file_len = ftell(file);
-  rewind(file);
+  /* read header information */
+  for (i=0; i<WAV_HEADER_SIZE; i++)
+    sound_header_buffer[i] = fgetc(file);
 
-  if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
+  /* read chunk "data" */
+  getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+  if (strcmp(chunk, "data") != 0)
   {
-    Error(ERR_WARN, "out of memory (this shouldn't happen :) - no sounds");
+    Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename);
     fclose(file);
-    return(FALSE);
+    return FALSE;
   }
 
-  if (fread(snd_info->file_ptr,1,snd_info->file_len,file)!=snd_info->file_len)
+  snd_info->data_len = chunk_length;
+  snd_info->data_ptr = checked_malloc(snd_info->data_len);
+
+  /* read sound data */
+  if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) !=
+      snd_info->data_len)
   {
     Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
     fclose(file);
-    return(FALSE);
+    return FALSE;
   }
 
   fclose(file);
 
-  sound_header = (struct SoundHeader_8SVX *)snd_info->file_ptr;
-
-  if (strncmp(sound_header->magic_FORM,"FORM",4) ||
-      snd_info->file_len != be2long(&sound_header->chunk_size)+8 ||
-      strncmp(sound_header->magic_8SVX,"8SVX",4))
-  {
-    Error(ERR_WARN, "'%s' is not an IFF/8SVX file or broken - no sounds",
-	  filename);
-    return(FALSE);
-  }
-
-  ptr = snd_info->file_ptr + 12;
+  for (i=0; i<snd_info->data_len; i++)
+    snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80;
 
-  while(ptr < (unsigned char *)(snd_info->file_ptr + snd_info->file_len))
-  {
-    if (!strncmp(ptr,"VHDR",4))
-    {
-      ptr += be2long((unsigned long *)(ptr + 4)) + 8;
-      continue;
-    }
-    else if (!strncmp(ptr,"ANNO",4))
-    {
-      ptr += be2long((unsigned long *)(ptr + 4)) + 8;
-      continue;
-    }
-    else if (!strncmp(ptr,"CHAN",4))
-    {
-      ptr += be2long((unsigned long *)(ptr + 4)) + 8;
-      continue;
-    }
-    else if (!strncmp(ptr,"BODY",4))
-    {
-      snd_info->data_ptr = ptr + 8;
-      snd_info->data_len = be2long((unsigned long *)(ptr + 4));
-      return(TRUE);
-    }
-    else
-    {
-      /* other chunk not recognized here */
-      ptr += be2long((unsigned long *)(ptr + 4)) + 8;
-      continue;
-    }
-  }
+#else /* MSDOS */
 
-  return(FALSE);
-#else
   snd_info->sample_ptr = load_sample(filename);
-  if(!snd_info->sample_ptr)
+  if (!snd_info->sample_ptr)
   {
     Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
-    fclose(file);
-    return(FALSE);
+    return FALSE;
   }
-  return(TRUE);
-#endif  // von  #ifndef MSDOS
+
+#endif /* MSDOS */
+#endif /* !TARGET_SDL */
+
+  return TRUE;
 }
 
 void PlaySound(int nr)
@@ -842,6 +903,14 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
   snd_ctrl.data_ptr	= Sound[nr].data_ptr;
   snd_ctrl.data_len	= Sound[nr].data_len;
 
+#ifdef TARGET_SDL
+
+  Mix_Volume(-1, SDL_MIX_MAXVOLUME / 4);
+  Mix_VolumeMusic(SDL_MIX_MAXVOLUME / 4);
+
+  Mix_PlayChannel(-1, Sound[nr].mix_chunk, (loop ? -1 : 0));
+
+#else
 #ifndef MSDOS
   if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
   {
@@ -852,6 +921,7 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
 #else
   sound_handler(snd_ctrl);
 #endif
+#endif
 }
 
 void FadeSound(int nr)
@@ -892,6 +962,20 @@ void StopSoundExt(int nr, int method)
     snd_ctrl.stop_sound = TRUE;
   }
 
+#ifdef TARGET_SDL
+
+  if (SSND_FADING(method))
+  {
+    Mix_FadeOutChannel(-1, 1000);
+    Mix_FadeOutMusic(1000);
+  }
+  else
+  {
+    Mix_HaltChannel(-1);
+    Mix_HaltMusic();
+  }
+
+#else
 #ifndef MSDOS
   if (write(sound_pipe[1], &snd_ctrl, sizeof(snd_ctrl))<0)
   {
@@ -902,18 +986,19 @@ void StopSoundExt(int nr, int method)
 #else
   sound_handler(snd_ctrl);
 #endif
+#endif
 }
 
-void FreeSounds(int max)
+void FreeSounds(int num_sounds)
 {
   int i;
 
-  if (sound_status==SOUND_OFF)
+  if (sound_status == SOUND_OFF)
     return;
 
-  for(i=0;i<max;i++)
+  for(i=0; i<num_sounds; i++)
 #ifndef MSDOS
-    free(Sound[i].file_ptr);
+    free(Sound[i].data_ptr);
 #else
     destroy_sample(Sound[i].sample_ptr);
 #endif