X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=c876945f8ea45374b15367616433530435bf27d4;hb=40bb242e83c3e4df5da57a052d42e1d2c37bf69d;hp=5d0817a33e0ce9558520a9623fd0ae0e4569ce52;hpb=0a85e6bd82e4c5c495be7201f672f788123dcb84;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 5d0817a3..c876945f 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -49,38 +49,19 @@ static int num_sounds = 0, num_music = 0; /* ========================================================================= */ /* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ -static struct AudioFormatInfo afmt = -{ - TRUE, 0, DEFAULT_AUDIO_SAMPLE_RATE, DEFAULT_AUDIO_FRAGMENT_SIZE -}; - +static struct AudioFormatInfo afmt; +static struct SoundControl playlist[NUM_MIXER_CHANNELS]; static int playing_sounds = 0; -static struct SoundControl playlist[MAX_SOUNDS_PLAYING]; -static struct SoundControl emptySoundControl = -{ - -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0, 0,NULL -}; - -#if defined(PLATFORM_UNIX) -static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1]; -static short premix_first_buffer[SND_BLOCKSIZE]; -#if defined(AUDIO_STREAMING_DSP) -static short premix_left_buffer[SND_BLOCKSIZE]; -static short premix_right_buffer[SND_BLOCKSIZE]; -static long premix_last_buffer[SND_BLOCKSIZE]; -#endif -static byte playing_buffer[SND_BLOCKSIZE]; -#endif /* forward declaration of internal functions */ -#if defined(AUDIO_STREAMING_DSP) static void SoundServer_InsertNewSound(struct SoundControl); -static void InitAudioDevice_DSP(struct AudioFormatInfo *); -#elif defined(PLATFORM_HPUX) -static void InitAudioDevice_HPUX(struct AudioFormatInfo *); -#elif defined(PLATFORM_UNIX) +static void InitAudioDevice(struct AudioFormatInfo *); + +#if defined(PLATFORM_UNIX) +#if !defined(AUDIO_STREAMING_DSP) static unsigned char linear_to_ulaw(int); static int ulaw_to_linear(unsigned char); +#endif #elif defined(PLATFORM_MSDOS) static void SoundServer_InsertNewSound(struct SoundControl); static void SoundServer_StopSound(struct SoundControl); @@ -94,21 +75,30 @@ static void FreeSound(void *); #if defined(PLATFORM_UNIX) static int OpenAudioDevice(char *audio_device_name) { - int audio_fd; + int audio_device_fd; /* check if desired audio device is accessible */ if (access(audio_device_name, W_OK) != 0) return -1; /* try to open audio device in non-blocking mode */ - if ((audio_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0) - return audio_fd; + if ((audio_device_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0) + return audio_device_fd; /* re-open audio device in blocking mode */ - close(audio_fd); - audio_fd = open(audio_device_name, O_WRONLY); + close(audio_device_fd); + audio_device_fd = open(audio_device_name, O_WRONLY); + + return audio_device_fd; +} + +static void CloseAudioDevice(int *audio_device_fd) +{ + if (*audio_device_fd == 0) + return; - return audio_fd; + close(*audio_device_fd); + *audio_device_fd = -1; } static boolean TestAudioDevices(void) @@ -118,21 +108,21 @@ static boolean TestAudioDevices(void) DEVICENAME_DSP, DEVICENAME_AUDIO }; - int audio_fd = -1; + int audio_device_fd = -1; int i; /* look for available audio devices, starting with preferred ones */ for (i=0; i= 0) + if ((audio_device_fd = OpenAudioDevice(audio_device_name[i])) >= 0) break; - if (audio_fd < 0) + if (audio_device_fd < 0) { Error(ERR_WARN, "cannot open audio device -- no sound"); return FALSE; } - close(audio_fd); + close(audio_device_fd); audio.device_name = audio_device_name[i]; @@ -180,6 +170,10 @@ void UnixOpenAudio(void) audio.music_available = TRUE; audio.loops_available = TRUE; #endif + + audio.num_channels = NUM_MIXER_CHANNELS; + audio.music_channel = MUSIC_CHANNEL; + audio.first_sound_channel = FIRST_SOUND_CHANNEL; } void UnixCloseAudio(void) @@ -190,17 +184,366 @@ void UnixCloseAudio(void) if (audio.soundserver_pid > 0) /* we are parent process */ kill(audio.soundserver_pid, SIGTERM); } + +static void WriteReloadInfoToPipe(char *set_name, int type) +{ + struct SoundControl snd_ctrl; + TreeInfo *ti = (type == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current : + artwork.mus_current); + unsigned long str_size1 = strlen(leveldir_current->fullpath) + 1; + unsigned long str_size2 = strlen(ti->basepath) + 1; + unsigned long str_size3 = strlen(ti->fullpath) + 1; + + snd_ctrl.active = FALSE; + snd_ctrl.state = type; + snd_ctrl.data_len = strlen(set_name) + 1; + + if (write(audio.soundserver_pipe[1], &snd_ctrl, + sizeof(snd_ctrl)) < 0 || + write(audio.soundserver_pipe[1], set_name, + snd_ctrl.data_len) < 0 || + write(audio.soundserver_pipe[1], leveldir_current, + sizeof(TreeInfo)) < 0 || + write(audio.soundserver_pipe[1], ti, + sizeof(TreeInfo)) < 0 || + write(audio.soundserver_pipe[1], &str_size1, + sizeof(unsigned long)) < 0 || + write(audio.soundserver_pipe[1], &str_size2, + sizeof(unsigned long)) < 0 || + write(audio.soundserver_pipe[1], &str_size3, + sizeof(unsigned long)) < 0 || + write(audio.soundserver_pipe[1], leveldir_current->fullpath, + str_size1) < 0 || + write(audio.soundserver_pipe[1], ti->basepath, + str_size2) < 0 || + write(audio.soundserver_pipe[1], ti->fullpath, + str_size3) < 0) + { + Error(ERR_WARN, "cannot pipe to child process -- no sounds"); + audio.sound_available = audio.sound_enabled = FALSE; + return; + } +} + +static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl) +{ + TreeInfo **ti_ptr = ((snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) ? + &artwork.snd_current : &artwork.mus_current); + TreeInfo *ti = *ti_ptr; + unsigned long str_size1, str_size2, str_size3; + static char *set_name = NULL; + + if (set_name) + free(set_name); + + set_name = checked_malloc(snd_ctrl.data_len); + + if (leveldir_current == NULL) + leveldir_current = checked_calloc(sizeof(TreeInfo)); + if (ti == NULL) + ti = *ti_ptr = checked_calloc(sizeof(TreeInfo)); + if (leveldir_current->fullpath != NULL) + free(leveldir_current->fullpath); + if (ti->basepath != NULL) + free(ti->basepath); + if (ti->fullpath != NULL) + free(ti->fullpath); + + if (read(audio.soundserver_pipe[0], set_name, + snd_ctrl.data_len) != snd_ctrl.data_len || + read(audio.soundserver_pipe[0], leveldir_current, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.soundserver_pipe[0], ti, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.soundserver_pipe[0], &str_size1, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.soundserver_pipe[0], &str_size2, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.soundserver_pipe[0], &str_size3, + sizeof(unsigned long)) != sizeof(unsigned long)) + Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); + + leveldir_current->fullpath = checked_calloc(str_size1); + ti->basepath = checked_calloc(str_size2); + ti->fullpath = checked_calloc(str_size3); + + if (read(audio.soundserver_pipe[0], leveldir_current->fullpath, + str_size1) != str_size1 || + read(audio.soundserver_pipe[0], ti->basepath, + str_size2) != str_size2 || + read(audio.soundserver_pipe[0], ti->fullpath, + str_size3) != str_size3) + Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); + + if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) + artwork.sounds_set_current = set_name; + else + artwork.music_set_current = set_name; +} #endif /* PLATFORM_UNIX */ void InitPlaylist(void) { int i; - for(i=0; i= num_sounds) + return; + + snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]); + if (snd_info == NULL) + { +#if 0 + printf("sound/music %d undefined\n", snd_ctrl.nr); +#endif + return; + } + +#if 0 + printf("-> %d\n", playing_sounds); +#endif + + if (playing_sounds == audio.num_channels) + { + for (i=0; i longest) + { + longest = actual; + longest_nr = i; + } + } +#if defined(PLATFORM_MSDOS) + voice_set_volume(playlist[longest_nr].voice, 0); + deallocate_voice(playlist[longest_nr].voice); +#endif + PlaylistRemoveSound(longest_nr); + } + + /* check if sound is already being played (and how often) */ + for (k=0, i=audio.first_sound_channel; i= 1 && IS_LOOP(snd_ctrl)) + { + for(i=audio.first_sound_channel; i= 2) + { + int longest = 0, longest_nr = audio.first_sound_channel; + + /* look for oldest equal sound */ + for(i=audio.first_sound_channel; i= longest) + { + longest = actual; + longest_nr = i; + } + } + +#if defined(PLATFORM_MSDOS) + voice_set_volume(playlist[longest_nr].voice, 0); + deallocate_voice(playlist[longest_nr].voice); +#endif + PlaylistRemoveSound(longest_nr); + } + + /* add new sound to playlist */ + for(i=0; idata_ptr; + snd_ctrl.data_len = snd_info->data_len; + snd_ctrl.format = snd_info->format; + + snd_ctrl.playingpos = 0; + snd_ctrl.playingtime = 0; + +#if 1 + if (snd_info->data_len == 0) + { + printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n"); + } +#endif + +#if 1 + if (IS_MUSIC(snd_ctrl) && i == audio.music_channel && playlist[i].active) + { + printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n"); + +#if 1 + PlaylistRemoveSound(i); +#endif + } +#endif + + playlist[i] = snd_ctrl; + playing_sounds++; + +#if 0 + printf("NEW SOUND %d ADDED TO PLAYLIST\n", snd_ctrl.nr); +#endif + +#if defined(PLATFORM_MSDOS) + playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr); + + if (snd_ctrl.loop) + voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP); + + voice_set_volume(playlist[i].voice, snd_ctrl.volume); + voice_set_pan(playlist[i].voice, snd_ctrl.stereo); + voice_start(playlist[i].voice); +#endif + break; + } + } +} + +static void HandleSoundRequest(struct SoundControl snd_ctrl) +{ + int i; + + if (IS_RELOADING(snd_ctrl)) /* load new sound or music files */ + { + ReadReloadInfoFromPipe(snd_ctrl); + InitPlaylist(); + CloseAudioDevice(&audio.device_fd); + + if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) + ReloadCustomSounds(); + else + ReloadCustomMusic(); + } + else if (IS_FADING(snd_ctrl)) /* fade out existing sound or music */ + { + if (!playing_sounds) + return; + + if (IS_MUSIC(snd_ctrl)) + { + playlist[audio.music_channel].state |= SND_CTRL_FADE; + return; + } + + for(i=audio.first_sound_channel; idata_ptr; + int i; + + if (snd_ctrl->format == AUDIO_FORMAT_U8) + for (i=0; i= SOUND_FADING_VOLUME_THRESHOLD) + playlist[i].volume -= SOUND_FADING_VOLUME_STEP; + + /* adjust volume of actual sound sample */ + if (playlist[i].volume != PSND_MAX_VOLUME) + for(j=0; j> PSND_MAX_VOLUME_BITS; + + /* fill the last mixing buffer with stereo or mono sound */ + if (stereo) + { + int middle_pos = PSND_MAX_LEFT2RIGHT / 2; + int left_volume = stereo_volume[middle_pos + playlist[i].stereo]; + int right_volume= stereo_volume[middle_pos - playlist[i].stereo]; + + for(j=0; j> PSND_MAX_LEFT2RIGHT_BITS; + premix_right_buffer[j] = + (right_volume * premix_first_buffer[j]) + >> PSND_MAX_LEFT2RIGHT_BITS; + + premix_last_buffer[2 * j + 0] += premix_left_buffer[j]; + premix_last_buffer[2 * j + 1] += premix_right_buffer[j]; + } + } + else + { + for(j=0; j= playlist[i].data_len) + { + if (IS_LOOP(playlist[i])) + playlist[i].playingpos = 0; + else + PlaylistRemoveSound(i); + } + else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD) + PlaylistRemoveSound(i); + } + + /* prepare final playing buffer according to system audio format */ + for(i=0; i 65535) + premix_last_buffer[i] = 65535; + + /* shift to 16 bit value */ + premix_last_buffer[i] >>= 1; + + if (afmt.format & AUDIO_FORMAT_U8) + { + playing_buffer[i] = (premix_last_buffer[i] >> 8) ^ 0x80; + } + else if (afmt.format & AUDIO_FORMAT_LE) /* 16 bit */ + { + playing_buffer[2 * i + 0] = premix_last_buffer[i] & 0xff; + playing_buffer[2 * i + 1] = premix_last_buffer[i] >> 8; + } + else /* big endian */ + { + playing_buffer[2 * i + 0] = premix_last_buffer[i] >> 8; + playing_buffer[2 * i + 1] = premix_last_buffer[i] & 0xff; + } + } + + /* finally play the sound fragment */ + write(audio.device_fd, playing_buffer, fragment_size); + + if (!playing_sounds) + CloseAudioDevice(&audio.device_fd); +} + +#else /* !AUDIO_STREAMING_DSP */ + +static int SoundServer_SimpleAudio(struct SoundControl snd_ctrl) +{ + static short premix_first_buffer[SND_BLOCKSIZE]; + static byte playing_buffer[SND_BLOCKSIZE]; + int max_sample_size = SND_BLOCKSIZE; + void *sample_ptr; + int sample_len; + int sample_pos; + int sample_size; + int i, j; + + i = 1; + + /* pointer, lenght and actual playing position of sound sample */ + sample_ptr = playlist[i].data_ptr; + sample_len = playlist[i].data_len; + sample_pos = playlist[i].playingpos; + sample_size = MIN(max_sample_size, sample_len - sample_pos); + playlist[i].playingpos += sample_size; + + /* copy original sample to first mixing buffer */ + CopySampleToMixingBuffer(&playlist[i], sample_pos, sample_size, + premix_first_buffer); + + /* adjust volume of actual sound sample */ + if (playlist[i].volume != PSND_MAX_VOLUME) + for(j=0; j> PSND_MAX_VOLUME_BITS; + + /* might be needed for u-law /dev/audio */ +#if 0 + for(j=0; j= playlist[i].data_len) + PlaylistRemoveSound(i); + + for(i=0; i> 8) ^ 0x80; + + /* finally play the sound fragment */ + write(audio.device_fd, playing_buffer, sample_size); + + return sample_size; +} +#endif /* !AUDIO_STREAMING_DSP */ + +void SoundServer() { - int i; - struct SoundControl snd_ctrl; fd_set sound_fdset; @@ -224,13 +810,8 @@ void SoundServer(void) InitPlaylist(); - stereo_volume[PSND_MAX_LEFT2RIGHT] = 0; - for(i=0; ifullpath != NULL) - free(leveldir_current->fullpath); - if (ti->basepath != NULL) - free(ti->basepath); - if (ti->fullpath != NULL) - free(ti->fullpath); - - if (read(audio.soundserver_pipe[0], set_name, - snd_ctrl.data_len) != snd_ctrl.data_len || - read(audio.soundserver_pipe[0], leveldir_current, - sizeof(TreeInfo)) != sizeof(TreeInfo) || - read(audio.soundserver_pipe[0], ti, - sizeof(TreeInfo)) != sizeof(TreeInfo) || - read(audio.soundserver_pipe[0], &str_size1, - sizeof(unsigned long)) != sizeof(unsigned long) || - read(audio.soundserver_pipe[0], &str_size2, - sizeof(unsigned long)) != sizeof(unsigned long) || - read(audio.soundserver_pipe[0], &str_size3, - sizeof(unsigned long)) != sizeof(unsigned long)) - Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); - - leveldir_current->fullpath = checked_calloc(str_size1); - ti->basepath = checked_calloc(str_size2); - ti->fullpath = checked_calloc(str_size3); - - if (read(audio.soundserver_pipe[0], leveldir_current->fullpath, - str_size1) != str_size1 || - read(audio.soundserver_pipe[0], ti->basepath, - str_size2) != str_size2 || - read(audio.soundserver_pipe[0], ti->fullpath, - str_size3) != str_size3) - Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); - - InitPlaylist(); - - close(audio.device_fd); - - if (snd_ctrl.reload_sounds) - { - artwork.sounds_set_current = set_name; - ReloadCustomSounds(); - } - else - { - artwork.music_set_current = set_name; - ReloadCustomMusic(); - } - - free(set_name); - - continue; - } + HandleSoundRequest(snd_ctrl); #if defined(AUDIO_STREAMING_DSP) - if (snd_ctrl.fade_sound) + while (playing_sounds && select(audio.soundserver_pipe[0] + 1, + &sound_fdset, NULL, NULL, &delay) < 1) { - if (!playing_sounds) - continue; + FD_SET(audio.soundserver_pipe[0], &sound_fdset); - if (snd_ctrl.music) - playlist[audio.music_channel].fade_sound = TRUE; - else - for(i=0; i= 0) - { - struct timeval delay = { 0, 0 }; - - if (!playing_sounds) /* we just opened the audio device */ - InitAudioDevice_DSP(&afmt); - - if (snd_ctrl.active) /* new sound has arrived */ - SoundServer_InsertNewSound(snd_ctrl); - - while (playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - int max_sample_size; - int fragment_size = afmt.fragment_size; - int sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2); - boolean stereo = afmt.stereo; - - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - max_sample_size = fragment_size / ((stereo ? 2 : 1) * sample_bytes); - - /* first clear the last premixing buffer */ - memset(premix_last_buffer, 0, - max_sample_size * (stereo ? 2 : 1) * sizeof(long)); - - for(i=0; i= SOUND_FADING_VOLUME_THRESHOLD) - playlist[i].volume -= SOUND_FADING_VOLUME_STEP; - - /* adjust volume of actual sound sample */ - if (playlist[i].volume != PSND_MAX_VOLUME) - for(j=0; j> PSND_MAX_VOLUME_BITS; - - /* fill the last mixing buffer with stereo or mono sound */ - if (stereo) - { - int middle_pos = PSND_MAX_LEFT2RIGHT / 2; - int left_volume = stereo_volume[middle_pos + playlist[i].stereo]; - int right_volume= stereo_volume[middle_pos - playlist[i].stereo]; - - for(j=0; j> PSND_MAX_LEFT2RIGHT_BITS; - premix_right_buffer[j] = - (right_volume * premix_first_buffer[j]) - >> PSND_MAX_LEFT2RIGHT_BITS; - - premix_last_buffer[2 * j + 0] += premix_left_buffer[j]; - premix_last_buffer[2 * j + 1] += premix_right_buffer[j]; - } - } - else - { - for(j=0; j= playlist[i].data_len) - { - if (playlist[i].loop) - playlist[i].playingpos = 0; - else - { - playlist[i] = emptySoundControl; - playing_sounds--; - } - } - else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD) - { - playlist[i] = emptySoundControl; - playing_sounds--; - } - } - - /* prepare final playing buffer according to system audio format */ - for(i=0; i 65535) - premix_last_buffer[i] = 65535; - - /* shift to 16 bit value */ - premix_last_buffer[i] >>= 1; - - if (afmt.format & AUDIO_FORMAT_U8) - { - playing_buffer[i] = (premix_last_buffer[i] >> 8) ^ 0x80; - } - else if (afmt.format & AUDIO_FORMAT_LE) /* 16 bit */ - { - playing_buffer[2 * i + 0] = premix_last_buffer[i] & 0xff; - playing_buffer[2 * i + 1] = premix_last_buffer[i] >> 8; - } - else /* big endian */ - { - playing_buffer[2 * i + 0] = premix_last_buffer[i] >> 8; - playing_buffer[2 * i + 1] = premix_last_buffer[i] & 0xff; - } - } - - /* finally play the sound fragment */ - write(audio.device_fd, playing_buffer, fragment_size); - } - - /* if no sounds playing, free device for other sound programs */ - if (!playing_sounds) - close(audio.device_fd); - } - } + int wait_percent = 90; /* wait 90% of the real playing time */ + int sample_size; -#else /* !AUDIO_STREAMING_DSP */ + FD_SET(audio.soundserver_pipe[0], &sound_fdset); - if (snd_ctrl.active && !snd_ctrl.loop) - { - struct timeval delay = { 0, 0 }; - 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 */ - int i; + sample_size = SoundServer_SimpleAudio(snd_ctrl); - if ((audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0) - { - playing_sounds = 1; - - while (playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - /* get pointer and size of the actual sound sample */ - sample_ptr = snd_ctrl.data_ptr + snd_ctrl.playingpos; - sample_size = - MIN(max_sample_size, snd_ctrl.data_len - snd_ctrl.playingpos); - snd_ctrl.playingpos += sample_size; - - /* fill the first mixing buffer with original sample */ - memcpy(premix_first_buffer,sample_ptr,sample_size); - - /* adjust volume of actual sound sample */ - if (snd_ctrl.volume != PSND_MAX_VOLUME) - for(i=0;i> PSND_MAX_VOLUME_BITS; - - for(i=0;i= snd_ctrl.data_len) - playing_sounds = 0; - - /* finally play the sound fragment */ - write(audio.device_fd,playing_buffer,sample_size); - - delay.tv_sec = 0; - delay.tv_usec = ((sample_size*10*wait_percent)/(sample_rate))*1000; - } - close(audio.device_fd); - } + delay.tv_sec = 0; + delay.tv_usec = + ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000; } + + CloseAudioDevice(&audio.device_fd); + + /* delete all sounds from playlist */ + InitPlaylist(); + #endif /* !AUDIO_STREAMING_DSP */ } } @@ -603,7 +887,7 @@ static void sound_handler(struct SoundControl snd_ctrl) if (!playing_sounds) return; - for (i=0; i= num_sounds) - return; - - /* if playlist is full, remove oldest sound */ - if (playing_sounds == MAX_SOUNDS_PLAYING) - { - int longest = 0, longest_nr = 0; - - for (i=0; i longest) - { - longest = actual; - longest_nr = i; - } - } -#if defined(PLATFORM_MSDOS) - voice_set_volume(playlist[longest_nr].voice, 0); - deallocate_voice(playlist[longest_nr].voice); -#endif - playlist[longest_nr] = emptySoundControl; - playing_sounds--; - } - - /* check if sound is already being played (and how often) */ - for (k=0,i=0; i= 1 && snd_ctrl.loop) - { - for(i=0; i= 2) - { - int longest = 0, longest_nr = 0; - - /* look for oldest equal sound */ - for(i=0; i= longest) - { - longest = actual; - longest_nr = i; - } - } - -#if defined(PLATFORM_MSDOS) - voice_set_volume(playlist[longest_nr].voice, 0); - deallocate_voice(playlist[longest_nr].voice); + /* copy sound_handler() here ... */ +} +#endif /* TARGET_SDL */ #endif - playlist[longest_nr] = emptySoundControl; - playing_sounds--; - } - - /* add new sound to playlist */ - for(i=0; idata_ptr; - snd_ctrl.data_len = snd_info->data_len; - snd_ctrl.format = snd_info->format; - - playlist[i] = snd_ctrl; - playing_sounds++; -#if defined(PLATFORM_MSDOS) - playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr); - - if (snd_ctrl.loop) - voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP); - - voice_set_volume(playlist[i].voice, snd_ctrl.volume); - voice_set_pan(playlist[i].voice, snd_ctrl.stereo); - voice_start(playlist[i].voice); -#endif - break; - } - } +#if !defined(PLATFORM_WIN32) +static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl) +{ + PlaylistInsertSound(snd_ctrl); } #endif /* !PLATFORM_WIN32 */ @@ -786,7 +955,7 @@ void SoundServer_FadeSound(int nr) if (!playing_sounds) return; - for(i=0;istereo = TRUE; + afmt->format = AUDIO_FORMAT_UNKNOWN; + afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; + afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; + #if defined(AUDIO_LINUX_IOCTL) InitAudioDevice_Linux(afmt); #elif defined(PLATFORM_NETBSD) InitAudioDevice_NetBSD(afmt); #elif defined(PLATFORM_HPUX) InitAudioDevice_HPUX(afmt); +#else + /* generic /dev/audio stuff might be placed here */ #endif } #endif /* PLATFORM_UNIX */ @@ -1123,7 +1298,7 @@ static SoundInfo *Load_WAV(char *filename) if (!audio.sound_available) return NULL; -#if 1 +#if 0 printf("loading WAV file '%s'\n", filename); #endif @@ -1230,50 +1405,87 @@ static SoundInfo *Load_WAV(char *filename) return snd_info; } -static void LoadCustomSound(SoundInfo **snd_info, char *basename) +static void deleteSoundEntry(SoundInfo **snd_info) { - char *filename = getCustomSoundFilename(basename); - - if (filename == NULL) /* (should never happen) */ - { - Error(ERR_WARN, "cannot find sound file '%s'", basename); - return; - } - if (*snd_info) { - char *filename_old = (*snd_info)->source_filename; - - if (strcmp(filename, filename_old) == 0) - { - /* The old and new sound are the same (have the same filename and path). - This usually means that this sound does not exist in this sound set - and a fallback to the existing sound is done. */ + char *filename = (*snd_info)->source_filename; -#if 1 - printf("[sound '%s' already exists]\n", filename); +#if 0 + printf("[decrementing reference counter of sound '%s']\n", filename); #endif - return; - } - if (--(*snd_info)->num_references <= 0) { -#if 1 - printf("[deleting sound '%s']\n", filename_old); +#if 0 + printf("[deleting sound '%s']\n", filename); #endif /* FreeSound(*snd_info); */ - deleteNodeFromList(&SoundFileList, filename_old, FreeSound); + deleteNodeFromList(&SoundFileList, filename, FreeSound); } + + *snd_info = NULL; + } +} + +static void replaceSoundEntry(SoundInfo **snd_info, char *filename) +{ + ListNode *node; + + /* check if the old and the new sound file are the same */ + if (*snd_info && strcmp((*snd_info)->source_filename, filename) == 0) + { + /* The old and new sound are the same (have the same filename and path). + This usually means that this sound does not exist in this sound set + and a fallback to the existing sound is done. */ + +#if 0 + printf("[sound '%s' already exists (same list entry)]\n", filename); +#endif + + return; + } + + /* delete existing sound file entry */ + deleteSoundEntry(snd_info); + + /* check if the new sound file already exists in the list of sounds */ + if ((node = getNodeFromKey(SoundFileList, filename)) != NULL) + { +#if 0 + printf("[sound '%s' already exists (other list entry)]\n", filename); +#endif + + *snd_info = (SoundInfo *)node->content; + (*snd_info)->num_references++; + } + else if ((*snd_info = Load_WAV(filename)) != NULL) /* load new sound */ + { + (*snd_info)->num_references = 1; + addNodeToList(&SoundFileList, (*snd_info)->source_filename, *snd_info); + } +} + +static void LoadCustomSound(SoundInfo **snd_info, char *basename) +{ + char *filename = getCustomSoundFilename(basename); + + if (strcmp(basename, SND_FILE_UNDEFINED) == 0) + { + deleteSoundEntry(snd_info); + return; } - *snd_info = Load_WAV(filename); - (*snd_info)->num_references = 1; + if (filename == NULL) + { + Error(ERR_WARN, "cannot find sound file '%s'", basename); + return; + } - addNodeToList(&SoundFileList, (*snd_info)->source_filename, *snd_info); + replaceSoundEntry(snd_info, filename); } void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries) @@ -1290,13 +1502,17 @@ void LoadSoundToList(char *basename, int list_pos) if (Sound == NULL || list_pos >= num_sounds) return; +#if 0 printf("loading sound '%s' ... [%d]\n", basename, getNumNodes(SoundFileList)); +#endif LoadCustomSound(&Sound[list_pos], basename); +#if 0 printf("loading sound '%s' done [%d]\n", basename, getNumNodes(SoundFileList)); +#endif } static MusicInfo *Load_MOD(char *filename) @@ -1398,27 +1614,27 @@ void PlayMusic(int nr) void PlaySound(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_NO_LOOP); + PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_SOUND); } void PlaySoundStereo(int nr, int stereo) { - PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, PSND_NO_LOOP); + PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, SND_CTRL_PLAY_SOUND); } void PlaySoundLoop(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP); + PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_LOOP); } void PlaySoundMusic(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_MUSIC); + PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC); } -void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type) +void PlaySoundExt(int nr, int volume, int stereo, int state) { - struct SoundControl snd_ctrl = emptySoundControl; + struct SoundControl snd_ctrl; if (!audio.sound_available || !audio.sound_enabled || @@ -1435,22 +1651,18 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type) else if (stereo > PSND_MAX_RIGHT) stereo = PSND_MAX_RIGHT; - snd_ctrl.nr = nr; - snd_ctrl.volume = volume; - snd_ctrl.stereo = stereo; - snd_ctrl.loop = (loop_type != PSND_NO_LOOP); - snd_ctrl.music = (loop_type == PSND_MUSIC); - snd_ctrl.active = TRUE; - -#if 0 - /* now only used internally in sound server child process */ - snd_ctrl.data_ptr = Sound[nr].data_ptr; - snd_ctrl.data_len = Sound[nr].data_len; -#endif + snd_ctrl.active = TRUE; + snd_ctrl.nr = nr; + snd_ctrl.volume = volume; + snd_ctrl.stereo = stereo; + snd_ctrl.state = state; #if defined(TARGET_SDL) - Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_PlayChannel(-1, Sound[nr]->data_ptr, (loop_type ? -1 : 0)); + if (Sound[nr]) + { + Mix_Volume(-1, SOUND_MAX_VOLUME); + Mix_PlayChannel(-1, Sound[nr]->data_ptr, (state & SND_CTRL_LOOP ? -1 : 0)); + } #elif defined(PLATFORM_UNIX) if (audio.soundserver_pid == 0) /* we are child process */ return; @@ -1475,19 +1687,19 @@ void FadeMusic(void) Mix_FadeOutMusic(SOUND_FADING_INTERVAL); Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); #else - StopSoundExt(-1, SSND_FADE_MUSIC); + StopSoundExt(-1, SND_CTRL_FADE_MUSIC); #endif } void FadeSound(int nr) { - StopSoundExt(nr, SSND_FADE_SOUND); + StopSoundExt(nr, SND_CTRL_FADE_SOUND); } void FadeSounds() { FadeMusic(); - StopSoundExt(-1, SSND_FADE_ALL); + StopSoundExt(-1, SND_CTRL_FADE_ALL); } void StopMusic(void) @@ -1499,51 +1711,46 @@ void StopMusic(void) Mix_HaltMusic(); Mix_HaltChannel(audio.music_channel); #else - StopSoundExt(-1, SSND_STOP_MUSIC); + StopSoundExt(-1, SND_CTRL_STOP_MUSIC); #endif } void StopSound(int nr) { - StopSoundExt(nr, SSND_STOP_SOUND); + StopSoundExt(nr, SND_CTRL_STOP_SOUND); } void StopSounds() { - StopSoundExt(-1, SSND_STOP_ALL); + StopMusic(); + StopSoundExt(-1, SND_CTRL_STOP_ALL); } -void StopSoundExt(int nr, int method) +void StopSoundExt(int nr, int state) { - struct SoundControl snd_ctrl = emptySoundControl; + struct SoundControl snd_ctrl; if (!audio.sound_available) return; - if (method & SSND_FADING) - snd_ctrl.fade_sound = TRUE; - - if (method & SSND_ALL) - snd_ctrl.stop_all_sounds = TRUE; - else - { - snd_ctrl.stop_sound = TRUE; - snd_ctrl.nr = nr; - } - - if (method & SSND_MUSIC) - snd_ctrl.music = TRUE; + snd_ctrl.active = FALSE; + snd_ctrl.nr = nr; + snd_ctrl.state = state; #if defined(TARGET_SDL) - if (method & SSND_FADING) + if (state & SND_CTRL_FADE) { int i; + /* + for (i=audio.first_sound_channel; ikey, key); +#endif if (strcmp((*node_first)->key, key) == 0) { +#if 0 printf("[DELETING LIST ENTRY]\n"); +#endif free((*node_first)->key); if (destructor_function) @@ -1636,7 +1847,8 @@ void dumpList(ListNode *node_first) while (node) { - printf("['%s']\n", node->key); + printf("['%s' (%d)]\n", node->key, + ((SoundInfo *)node->content)->num_references); node = node->next; } @@ -1681,12 +1893,16 @@ static void ReloadCustomSounds() { int i; -#if 1 +#if 0 printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current); #endif LoadSoundsInfo(); +#if 0 + printf("DEBUG: reloading %d sounds ...\n", num_sounds); +#endif + for(i=0; ifullpath) + 1; - unsigned long str_size2 = strlen(ti->basepath) + 1; - unsigned long str_size3 = strlen(ti->fullpath) + 1; -#endif - if (!audio.sound_available) return; #if defined(TARGET_SDL) || defined(TARGET_ALLEGRO) - if (type == SND_RELOAD_SOUNDS) - audio.func_reload_sounds(); + if (type == SND_CTRL_RELOAD_SOUNDS) + ReloadCustomSounds(); else - audio.func_reload_music(); + ReloadCustomMusic(); #elif defined(PLATFORM_UNIX) if (audio.soundserver_pid == 0) /* we are child process */ return; @@ -1738,8 +1948,12 @@ static void InitReloadSoundsOrMusic(char *set_name, int type) if (leveldir_current == NULL) /* should never happen */ Error(ERR_EXIT, "leveldir_current == NULL"); - snd_ctrl.reload_sounds = (type == SND_RELOAD_SOUNDS); - snd_ctrl.reload_music = (type == SND_RELOAD_MUSIC); +#if 1 + WriteReloadInfoToPipe(set_name, type); +#else + + snd_ctrl.active = FALSE; + snd_ctrl.state = type; snd_ctrl.data_len = strlen(set_name) + 1; if (write(audio.soundserver_pipe[1], &snd_ctrl, @@ -1768,16 +1982,18 @@ static void InitReloadSoundsOrMusic(char *set_name, int type) return; } #endif + +#endif } void InitReloadSounds(char *set_name) { - InitReloadSoundsOrMusic(set_name, SND_RELOAD_SOUNDS); + InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_SOUNDS); } void InitReloadMusic(char *set_name) { - InitReloadSoundsOrMusic(set_name, SND_RELOAD_MUSIC); + InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_MUSIC); } void FreeSound(void *ptr) @@ -1833,8 +2049,17 @@ void FreeAllSounds() if (Sound == NULL) return; + printf("%s: FREEING SOUNDS ...\n", + audio.soundserver_pid == 0 ? "CHILD" : "PARENT"); + for(i=0; i