X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fsound.c;h=7839902a50d21f24c7d2080035c3047cc11d6d6d;hp=c9e13525dc94a1aa061f86c20a31c1805d387c54;hb=8d46c5298f0fcce7bdb52f3835b2fbbdc403dfe0;hpb=05c80e257e74b9f48c5d4b5cc807db0a4fb82fd2 diff --git a/src/sound.c b/src/sound.c index c9e13525..7839902a 100644 --- a/src/sound.c +++ b/src/sound.c @@ -134,7 +134,10 @@ void SoundServer() long sample_size; static long max_sample_size = 0; static long fragment_size = 0; - boolean stereo; + /* Even if the stereo flag is used as being boolean, it must be + defined as an integer, else 'ioctl()' will fail! */ + int stereo = TRUE; + int sample_rate = 8000; if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0) { @@ -143,12 +146,35 @@ void SoundServer() /* 2 buffers / 512 bytes, giving 1/16 second resolution */ /* (with stereo the effective buffer size will shrink to 256) */ fragment_size = 0x00020009; - ioctl(sound_device, SNDCTL_DSP_SETFRAGMENT, &fragment_size); + + if (ioctl(sound_device, SNDCTL_DSP_SETFRAGMENT, &fragment_size) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set fragment size of /dev/dsp - no sounds"); + /* try if we can use stereo sound */ - stereo = TRUE; - ioctl(sound_device, SNDCTL_DSP_STEREO, &stereo); + if (ioctl(sound_device, SNDCTL_DSP_STEREO, &stereo) < 0) + { +#ifdef DEBUG + static boolean reported = FALSE; + + if (!reported) + { + Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp"); + reported = TRUE; + } +#endif + stereo = FALSE; + } + + if (ioctl(sound_device, SNDCTL_DSP_SPEED, &sample_rate) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set sample rate of /dev/dsp - no sounds"); + /* get the real fragmentation size; this should return 512 */ - ioctl(sound_device, SNDCTL_DSP_GETBLKSIZE, &fragment_size); + if (ioctl(sound_device, SNDCTL_DSP_GETBLKSIZE, &fragment_size) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot get fragment size of /dev/dsp - no sounds"); + max_sample_size = fragment_size / (stereo ? 2 : 1); } @@ -682,200 +708,93 @@ static 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; - - 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 */ +#define CHUNK_ID_LEN 4 /* IFF style chunk id length */ +#define WAV_HEADER_SIZE 20 /* size of WAV file header */ boolean LoadSound(struct SoundInfo *snd_info) { char filename[256]; char *sound_ext = "wav"; #ifndef MSDOS - struct SoundHeader_WAV *sound_header; + byte sound_header_buffer[WAV_HEADER_SIZE]; + char chunk[CHUNK_ID_LEN + 1]; + int chunk_length, dummy; FILE *file; int i; #endif sprintf(filename, "%s/%s/%s.%s", - options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext); + options.ro_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); + return FALSE; } - if (fseek(file, 0, SEEK_END) < 0) + /* read chunk "RIFF" */ + getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN); + if (strcmp(chunk, "RIFF") != 0) { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); + Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); fclose(file); - return(FALSE); + 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) + /* read chunk "WAVE" */ + getFileChunk(file, chunk, &dummy, BYTE_ORDER_LITTLE_ENDIAN); + if (strcmp(chunk, "WAVE") != 0) { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); + Error(ERR_WARN, "missing 'WAVE' chunk of sound file '%s'", 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; idata_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); - return(FALSE); + return FALSE; } -#endif /* MSDOS */ - - return(TRUE); -} - -boolean LoadSound_8SVX(struct SoundInfo *snd_info) -{ - char filename[256]; -#ifndef MSDOS - struct SoundHeader_8SVX *sound_header; - FILE *file; - char *ptr; - char *sound_ext = "8svx"; -#else - char *sound_ext = "wav"; -#endif - - sprintf(filename, "%s/%s/%s.%s", - options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext); - -#ifndef MSDOS - if (!(file=fopen(filename,"r"))) - { - Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename); - return(FALSE); - } + /* read header information */ + for (i=0; ifile_len = ftell(file); - rewind(file); + snd_info->data_len = chunk_length; + snd_info->data_ptr = checked_malloc(snd_info->data_len); - if (!(snd_info->file_ptr=malloc(snd_info->file_len))) - { - Error(ERR_WARN, "out of memory (this shouldn't happen :) - no sounds"); - fclose(file); - return(FALSE); - } - - if (fread(snd_info->file_ptr,1,snd_info->file_len,file)!=snd_info->file_len) + /* read sound data */ + if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) != + snd_info->data_len) { Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); fclose(file); - return(FALSE); + return FALSE; } fclose(file); - sound_header = (struct SoundHeader_8SVX *)snd_info->file_ptr; - - if (strncmp(sound_header->magic_FORM,"FORM",4) || - snd_info->file_len != be2long(&sound_header->chunk_size)+8 || - strncmp(sound_header->magic_8SVX,"8SVX",4)) - { - Error(ERR_WARN, "'%s' is not an IFF/8SVX file or broken - no sounds", - filename); - return(FALSE); - } - - ptr = (char *)snd_info->file_ptr + 12; - - while(ptr < (char *)(snd_info->file_ptr + snd_info->file_len)) - { - if (!strncmp(ptr,"VHDR",4)) - { - ptr += be2long((unsigned long *)(ptr + 4)) + 8; - continue; - } - else if (!strncmp(ptr,"ANNO",4)) - { - ptr += be2long((unsigned long *)(ptr + 4)) + 8; - continue; - } - else if (!strncmp(ptr,"CHAN",4)) - { - ptr += be2long((unsigned long *)(ptr + 4)) + 8; - continue; - } - else if (!strncmp(ptr,"BODY",4)) - { - snd_info->data_ptr = (byte *)ptr + 8; - snd_info->data_len = be2long((unsigned long *)(ptr + 4)); - return(TRUE); - } - else - { - /* other chunk not recognized here */ - ptr += be2long((unsigned long *)(ptr + 4)) + 8; - continue; - } - } + for (i=0; idata_len; i++) + snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80; - return(FALSE); #else /* MSDOS */ + snd_info->sample_ptr = load_sample(filename); - if(!snd_info->sample_ptr) + if (!snd_info->sample_ptr) { Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); return(FALSE); } - return(TRUE); + #endif /* MSDOS */ + + return(TRUE); } void PlaySound(int nr) @@ -980,16 +899,16 @@ void StopSoundExt(int nr, int method) #endif } -void FreeSounds(int max) +void FreeSounds(int num_sounds) { int i; - if (sound_status==SOUND_OFF) + if (sound_status == SOUND_OFF) return; - for(i=0;i