rnd-19981017-1

[rocksndiamonds.git] / src / sound.c

diff --git a/src/sound.c b/src/sound.c
index 4a323818ca6af535076445b403789ad18052fcad..be825edc9a510d0f8554a685d518e34490824122 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -73,7 +73,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, "broken pipe - no sounds");
+      Error(ERR_EXIT_SOUNDSERVER, "broken pipe - no sounds");
 
 #ifdef VOXWARE
 
@@ -119,7 +119,7 @@ void SoundServer()
       char *sample_ptr;
       long sample_size, max_sample_size;
       long fragment_size;
-      BOOL stereo;
+      boolean stereo;
 
       if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0)
       {
@@ -483,13 +483,13 @@ void HPUX_Audio_Control()
 
   audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY);
   if (audio_ctl == -1)
-    Error(ERR_EXIT, "cannot open /dev/audioCtl - no sounds");
+    Error(ERR_EXIT_SOUNDSERVER, "cannot open /dev/audioCtl - no sounds");
 
   if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1)
-    Error(ERR_EXIT, "no audio info - no sounds");
+    Error(ERR_EXIT_SOUNDSERVER, "no audio info - no sounds");
 
   if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1)
-    Error(ERR_EXIT, "ulaw audio not available - no sounds");
+    Error(ERR_EXIT_SOUNDSERVER, "ulaw audio not available - no sounds");
 
   ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1);
   ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000);
@@ -615,7 +615,7 @@ static unsigned long be2long(unsigned long *be)     /* big-endian -> longword */
   return(ptr[0]<<24 | ptr[1]<<16 | ptr[2]<<8 | ptr[3]);
 }
 
-BOOL LoadSound(struct SoundInfo *snd_info)
+boolean LoadSound(struct SoundInfo *snd_info)
 {
   FILE *file;
   char filename[256];
@@ -734,11 +734,11 @@ void PlaySoundLoop(int nr)
   PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP);
 }
 
-void PlaySoundExt(int nr, int volume, int stereo, BOOL loop)
+void PlaySoundExt(int nr, int volume, int stereo, boolean loop)
 {
   struct SoundControl snd_ctrl = emptySoundControl;
 
-  if (sound_status==SOUND_OFF || !sound_on)
+  if (sound_status==SOUND_OFF || !setup.sound_on)
     return;
 
   if (volume<PSND_MIN_VOLUME)