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

diff --git a/src/sound.c b/src/sound.c
index c9e13525..d302b0e7 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -23,7 +23,7 @@ static struct SoundControl emptySoundControl =
   -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL
 };
 
-#ifndef MSDOS
+#if !defined(MSDOS) && !defined(WIN32)
 static int stereo_volume[PSND_MAX_LEFT2RIGHT+1];
 static char premix_first_buffer[SND_BLOCKSIZE];
 #ifdef VOXWARE
@@ -32,31 +32,73 @@ static char premix_right_buffer[SND_BLOCKSIZE];
 static int premix_last_buffer[SND_BLOCKSIZE];
 #endif /* VOXWARE */
 static unsigned char playing_buffer[SND_BLOCKSIZE];
-#endif /* MSDOS */
+#endif /* !MSDOS && !WIN32 */
 
 /* forward declaration of internal functions */
 #ifdef VOXWARE
 static void SoundServer_InsertNewSound(struct SoundControl);
 #endif
-#ifndef VOXWARE
-#ifndef MSDOS
+
+#if !defined(VOXWARE) && !defined(MSDOS) && !defined(WIN32)
 static unsigned char linear_to_ulaw(int);
 static int ulaw_to_linear(unsigned char);
 #endif
-#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;
 
@@ -67,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] =
@@ -134,21 +176,52 @@ void SoundServer()
       long sample_size;
       static long max_sample_size = 0;
       static long fragment_size = 0;
-      boolean stereo;
+      /* 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);
 	}
 
@@ -275,7 +348,7 @@ void SoundServer()
       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;
 
@@ -321,7 +394,9 @@ void SoundServer()
 #endif /* !VOXWARE */
 
   }
-#endif /* !MSDOS */
+
+#endif /* !MSDOS && !WIN32 */
+
 }
 
 #ifdef MSDOS
@@ -377,6 +452,7 @@ static void sound_handler(struct SoundControl snd_ctrl)
 }
 #endif /* MSDOS */
 
+#ifndef WIN32
 static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
 {
   int i, k;
@@ -485,6 +561,7 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl)
     }
   }
 }
+#endif /* !WIN32 */
 
 /*
 void SoundServer_FadeSound(int nr)
@@ -500,6 +577,7 @@ void SoundServer_FadeSound(int nr)
 }
 */
 
+#ifndef WIN32
 #ifdef MSDOS
 static void SoundServer_StopSound(int nr)
 {
@@ -544,6 +622,7 @@ static void SoundServer_StopAllSounds()
 #endif
 }
 #endif /* MSDOS */
+#endif /* !WIN32 */
 
 #ifdef HPUX_AUDIO
 static void HPUX_Audio_Control()
@@ -568,8 +647,8 @@ static void HPUX_Audio_Control()
 }
 #endif /* HPUX_AUDIO */
 
-#ifndef VOXWARE
-#ifndef MSDOS
+#if !defined(VOXWARE) && !defined(MSDOS) && !defined(WIN32)
+
 /* these two are stolen from "sox"... :) */
 
 /*
@@ -673,8 +752,7 @@ static int ulaw_to_linear(unsigned char ulawbyte)
 
   return(sample);
 }
-#endif /* !MSDOS */
-#endif /* !VOXWARE */
+#endif /* !VOXWARE && !MSDOS && !WIN32 */
 
 /*** THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/
 
@@ -682,200 +760,107 @@ static int ulaw_to_linear(unsigned char ulawbyte)
 
 /*** THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS ***/
 
-#ifndef MSDOS
-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]);
-}
-#endif /* !MSDOS */
+#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)
 {
   char filename[256];
   char *sound_ext = "wav";
+#ifndef TARGET_SDL
 #ifndef MSDOS
-  struct SoundHeader_WAV *sound_header;
+  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);
-
-#ifndef MSDOS
-
-  if ((file = fopen(filename, "r")) == NULL)
-  {
-    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);
-    fclose(file);
-    return(FALSE);
-  }
-
-  snd_info->file_len = ftell(file);
-  rewind(file);
-
-  snd_info->file_ptr = checked_malloc(snd_info->file_len);
-
-  if (fread(snd_info->file_ptr, 1, snd_info->file_len, file) !=
-      snd_info->file_len)
-  {
-    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
-    fclose(file);
-    return(FALSE);
-  }
+	  options.ro_base_directory, SOUNDS_DIRECTORY,
+	  snd_info->name, sound_ext);
 
-  fclose(file);
+#ifdef TARGET_SDL
 
-  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)
-  {
-    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 /* MSDOS */
-
-  snd_info->sample_ptr = load_sample(filename);
-  if (!snd_info->sample_ptr)
+  snd_info->mix_chunk = Mix_LoadWAV(filename);
+  if (snd_info->mix_chunk == NULL)
   {
     Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
-    return(FALSE);
+    return FALSE;
   }
 
-#endif /* MSDOS */
+#else /* !TARGET_SDL */
 
-  return(TRUE);
-}
-
-boolean LoadSound_8SVX(struct SoundInfo *snd_info)
-{
-  char filename[256];
 #ifndef MSDOS
-  struct SoundHeader_8SVX *sound_header;
-  FILE *file;
-  char *ptr;
-  char *sound_ext = "8svx";
-#else
-  char *sound_ext = "wav";
-#endif
 
-  sprintf(filename, "%s/%s/%s.%s",
-	  options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
-
-#ifndef MSDOS
-  if (!(file=fopen(filename,"r")))
+  if ((file = fopen(filename, "r")) == NULL)
   {
     Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename);
-    return(FALSE);
+    return FALSE;
   }
 
-  if (fseek(file,0,SEEK_END)<0)
+  /* read chunk "RIFF" */
+  getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+  if (strcmp(chunk, "RIFF") != 0)
   {
-    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;
   }
 
-  snd_info->file_len = ftell(file);
-  rewind(file);
-
-  if (!(snd_info->file_ptr=malloc(snd_info->file_len)))
+  /* read chunk "WAVE" */
+  getFileChunk(file, chunk, &dummy, BYTE_ORDER_LITTLE_ENDIAN);
+  if (strcmp(chunk, "WAVE") != 0)
   {
-    Error(ERR_WARN, "out of memory (this shouldn't happen :) - no sounds");
+    Error(ERR_WARN, "missing 'WAVE' 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)
+  /* read header information */
+  for (i=0; i<WAV_HEADER_SIZE; i++)
+    sound_header_buffer[i] = fgetc(file);
+
+  /* read chunk "data" */
+  getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN);
+  if (strcmp(chunk, "data") != 0)
   {
-    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+    Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename);
     fclose(file);
-    return(FALSE);
+    return FALSE;
   }
 
-  fclose(file);
-
-  sound_header = (struct SoundHeader_8SVX *)snd_info->file_ptr;
+  snd_info->data_len = chunk_length;
+  snd_info->data_ptr = checked_malloc(snd_info->data_len);
 
-  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))
+  /* read sound data */
+  if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) !=
+      snd_info->data_len)
   {
-    Error(ERR_WARN, "'%s' is not an IFF/8SVX file or broken - no sounds",
-	  filename);
-    return(FALSE);
+    Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+    fclose(file);
+    return FALSE;
   }
 
-  ptr = (char *)snd_info->file_ptr + 12;
+  fclose(file);
 
-  while(ptr < (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 = (byte *)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;
-    }
-  }
+  for (i=0; i<snd_info->data_len; i++)
+    snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80;
 
-  return(FALSE);
 #else /* MSDOS */
+
   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);
-    return(FALSE);
+    return FALSE;
   }
-  return(TRUE);
+
 #endif /* MSDOS */
+#endif /* !TARGET_SDL */
+
+  return TRUE;
 }
 
 void PlaySound(int nr)
@@ -918,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)
   {
@@ -928,6 +921,7 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
 #else
   sound_handler(snd_ctrl);
 #endif
+#endif
 }
 
 void FadeSound(int nr)
@@ -968,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)
   {
@@ -978,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