};
static int stereo_volume[PSND_MAX_LEFT2RIGHT+1];
static char premix_first_buffer[SND_BLOCKSIZE];
+#ifdef VOXWARE
static char premix_left_buffer[SND_BLOCKSIZE];
static char premix_right_buffer[SND_BLOCKSIZE];
static int premix_last_buffer[SND_BLOCKSIZE];
+#endif
static unsigned char playing_buffer[SND_BLOCKSIZE];
static int playing_sounds = 0;
#else
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
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
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);
/*** 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 */
+
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);
+
+#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);
+ }
+
+ fclose(file);
+
+ 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)
+ {
+ Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename);
+ fclose(file);
+ return(FALSE);
+ }
+#endif /* MSDOS */
+
+ return(TRUE);
+}
+
+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);
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)
projects / rocksndiamonds.git / blobdiff