rnd-19981202-2

[rocksndiamonds.git] / src / sound.c

diff --git a/src/sound.c b/src/sound.c
index 2bf6c1a08b15a5a0a955a807604e5558197d9153..3f150101c4d9dfec8ca4015d525039b8fc96cab0 100644 (file)
--- 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
 
@@ -485,13 +485,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 +610,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 +624,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 +687,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 +706,12 @@ boolean LoadSound_8SVX(struct SoundInfo *snd_info)
   FILE *file;
   char filename[256];
 #ifndef MSDOS
+  struct SoundHeader_8SVX *sound_header;
+  unsigned 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);