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;
}
}
-#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 */
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 */
}
}
-#endif /* von '#ifdef VOXWARE' */
+#endif /* !VOXWARE */
}
#endif
char filename[256];
#ifndef MSDOS
struct SoundHeader_8SVX *sound_header;
- unsigned char *ptr;
+ char *ptr;
char *sound_ext = "8svx";
#else
char *sound_ext = "wav";
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))
{
}
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);
}
}
return(FALSE);
-#else
+#else /* MSDOS */
snd_info->sample_ptr = load_sample(filename);
if(!snd_info->sample_ptr)
{
return(FALSE);
}
return(TRUE);
-#endif // von #ifndef MSDOS
+#endif /* MSDOS */
}
void PlaySound(int nr)