X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fsound.c;h=2518499b3e9feb21fbd7fe1fd23a969079b877d1;hp=2bf6c1a08b15a5a0a955a807604e5558197d9153;hb=0918c3eb2f6219a8cc72aa85bd9c4889788dd474;hpb=833cc59e0cc1802432f21ddbaa763c99e541fafe

diff --git a/src/sound.c b/src/sound.c
index 2bf6c1a0..2518499b 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -75,7 +75,7 @@ void SoundServer()
     if (!FD_ISSET(sound_pipe[0], &sound_fdset))
       continue;
     if (read(sound_pipe[0], &snd_ctrl, sizeof(snd_ctrl)) != sizeof(snd_ctrl))
-      Error(ERR_EXIT_SOUNDSERVER, "broken pipe - no sounds");
+      Error(ERR_EXIT_SOUND_SERVER, "broken pipe - no sounds");
 
 #ifdef VOXWARE
 
@@ -118,8 +118,9 @@ void SoundServer()
     if (playing_sounds || snd_ctrl.active)
     {
       struct timeval delay = { 0, 0 };
-      char *sample_ptr;
-      long sample_size, max_sample_size;
+      byte *sample_ptr;
+      long sample_size;
+      long max_sample_size; /* MIGHT BE USED UNINITIALIZED!  TO BE FIXED! */
       long fragment_size;
       boolean stereo;
 
@@ -251,12 +252,12 @@ 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 */
@@ -272,9 +273,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,7 +306,7 @@ void SoundServer()
       }
     }
 
-#endif	/* von '#ifdef VOXWARE' */
+#endif /* !VOXWARE */
 
   }
 #endif
@@ -485,13 +486,13 @@ void HPUX_Audio_Control()
 
   audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY);
   if (audio_ctl == -1)
-    Error(ERR_EXIT_SOUNDSERVER, "cannot open /dev/audioCtl - no sounds");
+    Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl - no sounds");
 
   if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1)
-    Error(ERR_EXIT_SOUNDSERVER, "no audio info - no sounds");
+    Error(ERR_EXIT_SOUND_SERVER, "no audio info - no sounds");
 
   if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1)
-    Error(ERR_EXIT_SOUNDSERVER, "ulaw audio not available - no sounds");
+    Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available - no sounds");
 
   ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
   ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
@@ -610,6 +611,7 @@ 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;
@@ -623,14 +625,17 @@ static unsigned long le2long(unsigned long *be)	/* little-endian -> longword */
 
   return(ptr[3]<<24 | ptr[2]<<16 | ptr[1]<<8 | ptr[0]);
 }
+#endif /* !MSDOS */
 
 boolean LoadSound(struct SoundInfo *snd_info)
 {
   FILE *file;
   char filename[256];
   char *sound_ext = "wav";
+#ifndef MSDOS
   struct SoundHeader_WAV *sound_header;
   int i;
+#endif
 
   sprintf(filename, "%s/%s/%s.%s",
 	  options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext);
@@ -683,7 +688,7 @@ boolean LoadSound(struct SoundInfo *snd_info)
   for (i=0; i<snd_info->data_len; i++)
     snd_info->data_ptr[i] = snd_info->data_ptr[i]^0x80;
 
-#else
+#else /* MSDOS */
 
   snd_info->sample_ptr = load_sample(filename);
   if (!snd_info->sample_ptr)
@@ -702,12 +707,12 @@ boolean LoadSound_8SVX(struct SoundInfo *snd_info)
   FILE *file;
   char filename[256];
 #ifndef MSDOS
+  struct SoundHeader_8SVX *sound_header;
+  char *ptr;
   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);
@@ -756,9 +761,9 @@ boolean LoadSound_8SVX(struct SoundInfo *snd_info)
     return(FALSE);
   }
 
-  ptr = snd_info->file_ptr + 12;
+  ptr = (char *)snd_info->file_ptr + 12;
 
-  while(ptr < (unsigned char *)(snd_info->file_ptr + snd_info->file_len))
+  while(ptr < (char *)(snd_info->file_ptr + snd_info->file_len))
   {
     if (!strncmp(ptr,"VHDR",4))
     {
@@ -777,7 +782,7 @@ boolean LoadSound_8SVX(struct SoundInfo *snd_info)
     }
     else if (!strncmp(ptr,"BODY",4))
     {
-      snd_info->data_ptr = ptr + 8;
+      snd_info->data_ptr = (byte *)ptr + 8;
       snd_info->data_len = be2long((unsigned long *)(ptr + 4));
       return(TRUE);
     }
@@ -790,7 +795,7 @@ boolean LoadSound_8SVX(struct SoundInfo *snd_info)
   }
 
   return(FALSE);
-#else
+#else /* MSDOS */
   snd_info->sample_ptr = load_sample(filename);
   if(!snd_info->sample_ptr)
   {
@@ -799,7 +804,7 @@ boolean LoadSound_8SVX(struct SoundInfo *snd_info)
     return(FALSE);
   }
   return(TRUE);
-#endif  // von  #ifndef MSDOS
+#endif /* MSDOS */
 }
 
 void PlaySound(int nr)