X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fsound.c;h=340ec942b8ebc30d25e62107bdf02a28e30498c5;hp=af9af974c33c8540c028cbfef04269f4c53946a4;hb=50c422d96b6da2c0412b6bd3763e9d1a029a6014;hpb=823bddb0d9cc63ddda17a2cd20266aa3b82bde38 diff --git a/src/sound.c b/src/sound.c index af9af974..340ec942 100644 --- a/src/sound.c +++ b/src/sound.c @@ -12,29 +12,43 @@ ***********************************************************/ #include "sound.h" -#ifdef MSDOS -extern void sound_handler(struct SoundControl); -#endif +#include "misc.h" /*** THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/ -#ifndef MSDOS +static int playing_sounds = 0; static struct SoundControl playlist[MAX_SOUNDS_PLAYING]; static struct SoundControl emptySoundControl = { -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL }; + +#ifndef MSDOS 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 /* VOXWARE */ static unsigned char playing_buffer[SND_BLOCKSIZE]; -static int playing_sounds = 0; -#else -struct SoundControl playlist[MAX_SOUNDS_PLAYING]; -struct SoundControl emptySoundControl; -int playing_sounds; +#endif /* MSDOS */ + +/* forward declaration of internal functions */ +#ifdef VOXWARE +static void SoundServer_InsertNewSound(struct SoundControl); +#endif +#ifndef VOXWARE +static unsigned char linear_to_ulaw(int); +static int ulaw_to_linear(unsigned char); +#endif +#ifdef HPUX_AUDIO +static void HPUX_Audio_Control(); +#endif +#ifdef MSDOS +static void SoundServer_InsertNewSound(struct SoundControl); +static void SoundServer_StopSound(int); +static void SoundServer_StopAllSounds(); #endif void SoundServer() @@ -64,17 +78,14 @@ void SoundServer() FD_ZERO(&sound_fdset); FD_SET(sound_pipe[0], &sound_fdset); - for(;;) /* wait for calls from PlaySound(), StopSound(), ... */ + while(1) /* wait for sound playing commands from client */ { FD_SET(sound_pipe[0], &sound_fdset); select(sound_pipe[0]+1, &sound_fdset, NULL, NULL, NULL); if (!FD_ISSET(sound_pipe[0], &sound_fdset)) continue; if (read(sound_pipe[0], &snd_ctrl, sizeof(snd_ctrl)) != sizeof(snd_ctrl)) - { - fprintf(stderr,"%s: broken pipe - no sounds\n",progname); - exit(0); - } + Error(ERR_EXIT_SOUND_SERVER, "broken pipe - no sounds"); #ifdef VOXWARE @@ -117,10 +128,11 @@ void SoundServer() if (playing_sounds || snd_ctrl.active) { struct timeval delay = { 0, 0 }; - char *sample_ptr; - long sample_size, max_sample_size; - long fragment_size; - BOOL stereo; + byte *sample_ptr; + long sample_size; + static long max_sample_size = 0; + static long fragment_size = 0; + boolean stereo; if (playing_sounds || (sound_device=open(sound_device_name,O_WRONLY))>=0) { @@ -250,12 +262,12 @@ void SoundServer() } } -#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 */ @@ -271,9 +283,9 @@ void SoundServer() 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 */ @@ -304,17 +316,70 @@ void SoundServer() } } -#endif /* von '#ifdef VOXWARE' */ +#endif /* !VOXWARE */ } -#endif +#endif /* !MSDOS */ } -void SoundServer_InsertNewSound(struct SoundControl snd_ctrl) +#ifdef MSDOS +static void sound_handler(struct SoundControl snd_ctrl) { - int i,k; + int i; - /* wenn voll, ältesten Sound 'rauswerfen */ + if (snd_ctrl.fade_sound) + { + if (!playing_sounds) + return; + + for (i=0; i=1 && snd_ctrl.loop) { for(i=0;i=2) { int longest=0, longest_nr=0; - /* den bereits am längsten gespielten (gleichen) Sound suchen */ + /* look for oldest equal sound */ for(i=0;i longword */ { unsigned char *ptr = (unsigned char *)be; @@ -625,32 +682,115 @@ 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) +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) +{ + char filename[256]; + char *sound_ext = "wav"; +#ifndef MSDOS + struct SoundHeader_WAV *sound_header; FILE *file; + 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; 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); + } + +#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 - struct SoundHeader_8SVX *sound_header; - unsigned char *ptr; - sprintf(filename,"%s/%s.%s",SND_PATH,snd_info->name,sound_ext); + sprintf(filename, "%s/%s/%s.%s", + options.base_directory, SOUNDS_DIRECTORY, snd_info->name, sound_ext); #ifndef MSDOS if (!(file=fopen(filename,"r"))) { - fprintf(stderr,"%s: cannot open sound file '%s' - no sounds\n", - progname,filename); + Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename); return(FALSE); } if (fseek(file,0,SEEK_END)<0) { - fprintf(stderr,"%s: cannot read sound file '%s' - no sounds\n", - progname,filename); + Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); fclose(file); return(FALSE); } @@ -660,16 +800,14 @@ BOOL LoadSound(struct SoundInfo *snd_info) if (!(snd_info->file_ptr=malloc(snd_info->file_len))) { - fprintf(stderr,"%s: out of memory (this shouldn't happen :) - no sounds\n", - progname); + 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) { - fprintf(stderr,"%s: cannot read sound file '%s' - no sounds\n", - progname,filename); + Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); fclose(file); return(FALSE); } @@ -682,14 +820,14 @@ BOOL LoadSound(struct SoundInfo *snd_info) snd_info->file_len != be2long(&sound_header->chunk_size)+8 || strncmp(sound_header->magic_8SVX,"8SVX",4)) { - fprintf(stderr,"%s: '%s' is not an IFF/8SVX file or broken- no sounds\n", - progname,filename); + Error(ERR_WARN, "'%s' is not an IFF/8SVX file or broken - no sounds", + filename); 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)) { @@ -708,7 +846,7 @@ BOOL LoadSound(struct SoundInfo *snd_info) } 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); } @@ -721,17 +859,15 @@ BOOL LoadSound(struct SoundInfo *snd_info) } return(FALSE); -#else +#else /* MSDOS */ snd_info->sample_ptr = load_sample(filename); if(!snd_info->sample_ptr) { - fprintf(stderr,"%s: cannot read sound file '%s' - no sounds\n", - progname,filename); - fclose(file); + Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); return(FALSE); } return(TRUE); -#endif // von #ifndef MSDOS +#endif /* MSDOS */ } void PlaySound(int nr) @@ -749,11 +885,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) return; if (volume