X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=ceeee1477b532295520d29efda50b861118f410c;hb=77570cca460afce38d688221214f93f0c6d0a8c9;hp=4b62e341fbd0e8d7d3029df0d8ab82ec3913b0cd;hpb=696d50b659131ba46ea7f4c44ca4d29475e8cb4f;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 4b62e341..ceeee147 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -24,6 +24,9 @@ #include "setup.h" +#define IS_PARENT_PROCESS(pid) ((pid) > 0) +#define IS_CHILD_PROCESS(pid) ((pid) == 0) + struct ListNode { char *key; @@ -49,66 +52,56 @@ 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 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 -}; +static struct SoundControl mixer[NUM_MIXER_CHANNELS]; +static int mixer_active_channels = 0; -#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 +#if defined(AUDIO_UNIX_NATIVE) +static struct AudioFormatInfo afmt; -/* 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 Mixer_Main(void); +#if !defined(AUDIO_STREAMING_DSP) static unsigned char linear_to_ulaw(int); static int ulaw_to_linear(unsigned char); -#elif defined(PLATFORM_MSDOS) -static void SoundServer_InsertNewSound(struct SoundControl); -static void SoundServer_StopSound(struct SoundControl); -static void SoundServer_StopAllSounds(); +#endif #endif static void ReloadCustomSounds(); static void ReloadCustomMusic(); static void FreeSound(void *); -#if defined(PLATFORM_UNIX) + +/* ------------------------------------------------------------------------- */ +/* functions for native (non-SDL) Unix audio/mixer support */ +/* ------------------------------------------------------------------------- */ + +#if defined(AUDIO_UNIX_NATIVE) + 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; +} - return audio_fd; +static void CloseAudioDevice(int *audio_device_fd) +{ + if (*audio_device_fd == 0) + return; + + close(*audio_device_fd); + *audio_device_fd = -1; } static boolean TestAudioDevices(void) @@ -118,55 +111,48 @@ 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]; return TRUE; } -#if !defined(TARGET_SDL) static boolean ForkAudioProcess(void) { - if (pipe(audio.soundserver_pipe) < 0) + if (pipe(audio.mixer_pipe) < 0) { Error(ERR_WARN, "cannot create pipe -- no sounds"); return FALSE; } - if ((audio.soundserver_pid = fork()) < 0) + if ((audio.mixer_pid = fork()) < 0) { Error(ERR_WARN, "cannot create sound server process -- no sounds"); return FALSE; } - if (audio.soundserver_pid == 0) /* we are child process */ - { - SoundServer(); - - /* never reached */ - exit(0); - } - else /* we are parent */ - close(audio.soundserver_pipe[0]); /* no reading from pipe needed */ + if (IS_CHILD_PROCESS(audio.mixer_pid)) + Mixer_Main(); /* this function never returns */ + else + close(audio.mixer_pipe[0]); /* no reading from pipe needed */ return TRUE; } -#endif void UnixOpenAudio(void) { @@ -180,6 +166,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) @@ -187,665 +177,13 @@ void UnixCloseAudio(void) if (audio.device_fd) close(audio.device_fd); - if (audio.soundserver_pid > 0) /* we are parent process */ - kill(audio.soundserver_pid, SIGTERM); -} -#endif /* PLATFORM_UNIX */ - -void InitPlaylist(void) -{ - int i; - - 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; - } - -#if defined(AUDIO_STREAMING_DSP) - - if (snd_ctrl.fade_sound) - { - if (!playing_sounds) - continue; - - 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); - } - } - -#else /* !AUDIO_STREAMING_DSP */ - - 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; - - 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); - } - } -#endif /* !AUDIO_STREAMING_DSP */ - } -} -#endif /* PLATFORM_UNIX */ - -#if defined(PLATFORM_MSDOS) -static void sound_handler(struct SoundControl snd_ctrl) -{ - int i; - - if (snd_ctrl.fade_sound) - { - 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); -#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; - } - } -} -#endif /* !PLATFORM_WIN32 */ - -/* -void SoundServer_FadeSound(int nr) -{ - int i; - - if (!playing_sounds) - return; - - for(i=0;iformat = AUDIO_FORMAT_U8; + afmt->stereo = TRUE; + + if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + { + /* try to disable stereo */ + a_info.play.channels = 1; + + afmt->stereo = FALSE; + + if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set sample rate of /dev/audio -- no sounds"); + } +} +#endif /* PLATFORM_NETBSD */ + +#if defined(PLATFORM_HPUX) +static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) +{ + struct audio_describe ainfo; + int audio_ctl; + + audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); + if (audio_ctl == -1) + Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); + + if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) + 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_SOUND_SERVER, "ulaw audio not available -- no sounds"); + + ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); + ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); + + afmt->format = AUDIO_FORMAT_U8; + afmt->stereo = FALSE; + afmt->sample_rate = 8000; + + close(audio_ctl); +} +#endif /* PLATFORM_HPUX */ + +static void InitAudioDevice(struct AudioFormatInfo *afmt) +{ + afmt->stereo = 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 +} + + +/* ------------------------------------------------------------------------- */ +/* functions for communication between main process and sound mixer process */ +/* ------------------------------------------------------------------------- */ + +static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl) +{ + if (IS_CHILD_PROCESS(audio.mixer_pid)) + return; + + if (write(audio.mixer_pipe[1], snd_ctrl, sizeof(SoundControl)) < 0) + { + Error(ERR_WARN, "cannot pipe to child process -- no sounds"); + audio.sound_available = audio.sound_enabled = FALSE; + return; + } +} + +static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl) +{ + if (IS_PARENT_PROCESS(audio.mixer_pid)) + return; + + if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(SoundControl)) + != sizeof(SoundControl)) + Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); +} + +static void WriteReloadInfoToPipe(char *set_name, int type) +{ + 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; + + if (IS_CHILD_PROCESS(audio.mixer_pid)) + return; + + if (leveldir_current == NULL) /* should never happen */ + Error(ERR_EXIT, "leveldir_current == NULL"); + + snd_ctrl.active = FALSE; + snd_ctrl.state = type; + snd_ctrl.data_len = strlen(set_name) + 1; + + if (write(audio.mixer_pipe[1], &snd_ctrl, + sizeof(snd_ctrl)) < 0 || + write(audio.mixer_pipe[1], set_name, + snd_ctrl.data_len) < 0 || + write(audio.mixer_pipe[1], leveldir_current, + sizeof(TreeInfo)) < 0 || + write(audio.mixer_pipe[1], ti, + sizeof(TreeInfo)) < 0 || + write(audio.mixer_pipe[1], &str_size1, + sizeof(unsigned long)) < 0 || + write(audio.mixer_pipe[1], &str_size2, + sizeof(unsigned long)) < 0 || + write(audio.mixer_pipe[1], &str_size3, + sizeof(unsigned long)) < 0 || + write(audio.mixer_pipe[1], leveldir_current->fullpath, + str_size1) < 0 || + write(audio.mixer_pipe[1], ti->basepath, + str_size2) < 0 || + write(audio.mixer_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(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.mixer_pipe[0], set_name, + snd_ctrl->data_len) != snd_ctrl->data_len || + read(audio.mixer_pipe[0], leveldir_current, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.mixer_pipe[0], ti, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.mixer_pipe[0], &str_size1, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.mixer_pipe[0], &str_size2, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.mixer_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.mixer_pipe[0], leveldir_current->fullpath, + str_size1) != str_size1 || + read(audio.mixer_pipe[0], ti->basepath, + str_size2) != str_size2 || + read(audio.mixer_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 /* AUDIO_UNIX_NATIVE */ + + +/* ------------------------------------------------------------------------- */ +/* mixer functions */ +/* ------------------------------------------------------------------------- */ + +void Mixer_InitChannels() +{ + int i; + + for(i=0; i %d [%d]\n", Mix_Playing(channel), Mix_Playing(0)); +#endif +#endif + + if (!mixer[channel].active) + return; + +#if defined(TARGET_SDL) + Mix_HaltChannel(channel); +#elif defined(PLATFORM_MSDOS) + voice_set_volume(mixer[channel].voice, 0); + deallocate_voice(mixer[channel].voice); +#endif + + mixer[channel].active = FALSE; + mixer_active_channels--; +} + +static void Mixer_StopMusicChannel() +{ + Mixer_StopChannel(audio.music_channel); + +#if defined(TARGET_SDL) + Mix_HaltMusic(); +#endif +} + +static void Mixer_FadeChannel(int channel) +{ + if (!mixer[channel].active) + return; + + mixer[channel].state |= SND_CTRL_FADE; + +#if defined(TARGET_SDL) + Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL); +#elif defined(PLATFORM_MSDOS) + if (voice_check(mixer[channel].voice)) + voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, 0); +#endif +} + +static void Mixer_FadeMusicChannel() +{ + Mixer_FadeChannel(audio.music_channel); + +#if defined(TARGET_SDL) + Mix_FadeOutMusic(SOUND_FADING_INTERVAL); +#endif +} + +static void Mixer_UnFadeChannel(int channel) +{ + if (!mixer[channel].active || !IS_FADING(mixer[channel])) + return; + + mixer[channel].state &= ~SND_CTRL_FADE; + mixer[channel].volume = PSND_MAX_VOLUME; + +#if defined(TARGET_SDL) + Mix_ExpireChannel(channel, -1); + Mix_Volume(channel, SOUND_MAX_VOLUME); +#elif defined(TARGET_ALLEGRO) + voice_stop_volumeramp(mixer[channel].voice); + voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, + mixer[channel].volume); +#endif +} + +static void Mixer_InsertSound(SoundControl snd_ctrl) +{ + SoundInfo *snd_info; + int i, k; + +#if 0 + printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds); +#endif + +#if 0 + printf("%d ACTIVE CHANNELS\n", mixer_active_channels); +#endif + + if (IS_MUSIC(snd_ctrl)) + snd_ctrl.nr = snd_ctrl.nr % num_music; + else if (snd_ctrl.nr >= num_sounds) + return; + + snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]); + if (snd_info == NULL) + return; + + /* copy sound sample and format information */ + snd_ctrl.type = snd_info->type; + snd_ctrl.format = snd_info->format; + snd_ctrl.data_ptr = snd_info->data_ptr; + snd_ctrl.data_len = snd_info->data_len; + + /* play music samples on a dedicated music channel */ + if (IS_MUSIC(snd_ctrl)) + { + mixer[audio.music_channel] = snd_ctrl; + Mixer_PlayMusicChannel(); + + return; + } + + /* 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) + { + unsigned long playing_current = Counter(); + 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; + } + } + + Mixer_StopChannel(longest_nr); + } + + /* If all (non-music) channels are active, stop the channel that has + played its sound sample most completely (in percent of the sample + length). As we cannot currently get the actual playing position + of the channel's sound sample when compiling with the SDL mixer + library, we use the current playing time (in milliseconds) instead. */ + + if (mixer_active_channels == + audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1)) + { + unsigned long playing_current = Counter(); + int longest = 0, longest_nr = audio.first_sound_channel; + + for (i=audio.first_sound_channel; i longest) + { + longest = actual; + longest_nr = i; + } + } + + Mixer_StopChannel(longest_nr); + } + + /* add new sound to mixer */ + for(i=0; idata_len == 0) + { + printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n"); + } +#endif +#endif + +#if 1 + if (IS_MUSIC(snd_ctrl) && i == audio.music_channel && mixer[i].active) + { + printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n"); + +#if 1 + Mixer_StopChannel(i); +#endif + } +#endif + + mixer[i] = snd_ctrl; + Mixer_PlayChannel(i); + + break; + } + } +} + +static void HandleSoundRequest(SoundControl snd_ctrl) +{ + int i; + +#if defined(AUDIO_UNIX_NATIVE) + if (IS_PARENT_PROCESS(audio.mixer_pid)) + { + SendSoundControlToMixerProcess(&snd_ctrl); + return; + } +#elif defined(TARGET_SDL) + for (i=0; imajor, + link_version->minor, + link_version->patch); +#endif + + if (!audio.sound_available) + return; + +#if defined(AUDIO_UNIX_NATIVE) + if (!ForkAudioProcess()) + audio.sound_available = FALSE; +#endif +} + +#if defined(AUDIO_UNIX_NATIVE) + +static void CopySampleToMixingBuffer(SoundControl *snd_ctrl, + int sample_pos, int sample_size, + short *buffer_ptr) +{ + void *sample_ptr = snd_ctrl->data_ptr; + int i; + + if (snd_ctrl->format == AUDIO_FORMAT_U8) + for (i=0; i= SOUND_FADING_VOLUME_THRESHOLD) + mixer[i].volume -= SOUND_FADING_VOLUME_STEP; + + /* adjust volume of actual sound sample */ + if (mixer[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 + mixer[i].stereo_position]; + int right_volume= stereo_volume[middle_pos - mixer[i].stereo_position]; + + 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= mixer[i].data_len) + { + if (IS_LOOP(mixer[i])) + mixer[i].playing_pos = 0; + else + Mixer_StopChannel(i); + } + else if (mixer[i].volume <= SOUND_FADING_VOLUME_THRESHOLD) + Mixer_StopChannel(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 (!mixer_active_channels) + CloseAudioDevice(&audio.device_fd); +} + +#else /* !AUDIO_STREAMING_DSP */ + +static int Mixer_Main_SimpleAudio(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 = mixer[i].data_ptr; + sample_len = mixer[i].data_len; + sample_pos = mixer[i].playing_pos; + sample_size = MIN(max_sample_size, sample_len - sample_pos); + mixer[i].playing_pos += sample_size; + + /* copy original sample to first mixing buffer */ + CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size, + premix_first_buffer); + + /* adjust volume of actual sound sample */ + if (mixer[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= mixer[i].data_len) + Mixer_StopChannel(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 */ -#if defined(PLATFORM_NETBSD) -static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) +void Mixer_Main() { - audio_info_t a_info; - boolean stereo = TRUE; + SoundControl snd_ctrl; + fd_set mixer_fdset; - AUDIO_INITINFO(&a_info); - a_info.play.encoding = AUDIO_ENCODING_LINEAR8; - a_info.play.precision = 8; - a_info.play.channels = 2; - a_info.play.sample_rate = sample_rate; - a_info.blocksize = fragment_size; + close(audio.mixer_pipe[1]); /* no writing into pipe needed */ - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = TRUE; + Mixer_InitChannels(); - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) +#if defined(PLATFORM_HPUX) + InitAudioDevice(&afmt); +#endif + + FD_ZERO(&mixer_fdset); + FD_SET(audio.mixer_pipe[0], &mixer_fdset); + + while(1) /* wait for sound playing commands from client */ { - /* try to disable stereo */ - a_info.play.channels = 1; + struct timeval delay = { 0, 0 }; - afmt->stereo = FALSE; + FD_SET(audio.mixer_pipe[0], &mixer_fdset); + select(audio.mixer_pipe[0] + 1, &mixer_fdset, NULL, NULL, NULL); + if (!FD_ISSET(audio.mixer_pipe[0], &mixer_fdset)) + continue; - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/audio -- no sounds"); - } -} -#endif /* PLATFORM_NETBSD */ + ReadSoundControlFromMainProcess(&snd_ctrl); -#if defined(PLATFORM_HPUX) -static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) -{ - struct audio_describe ainfo; - int audio_ctl; + HandleSoundRequest(snd_ctrl); - audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); - if (audio_ctl == -1) - Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); +#if defined(AUDIO_STREAMING_DSP) - if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds"); + while (mixer_active_channels && + select(audio.mixer_pipe[0] + 1, + &mixer_fdset, NULL, NULL, &delay) < 1) + { + FD_SET(audio.mixer_pipe[0], &mixer_fdset); - if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) - Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds"); + Mixer_Main_DSP(); + } - ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); - ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); +#else /* !AUDIO_STREAMING_DSP */ - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = FALSE; - afmt->sample_rate = 8000; + if (!snd_ctrl.active || IS_LOOP(snd_ctrl) || + (audio.device_fd = OpenAudioDevice(audio.device_name)) < 0) + continue; - close(audio_ctl); -} -#endif /* PLATFORM_HPUX */ + InitAudioDevice(&afmt); -#if defined(PLATFORM_UNIX) -static void InitAudioDevice_DSP(struct AudioFormatInfo *afmt) -{ -#if defined(AUDIO_LINUX_IOCTL) - InitAudioDevice_Linux(afmt); -#elif defined(PLATFORM_NETBSD) - InitAudioDevice_NetBSD(afmt); -#elif defined(PLATFORM_HPUX) - InitAudioDevice_HPUX(afmt); -#endif + delay.tv_sec = 0; + delay.tv_usec = 0; + + while (mixer_active_channels && + select(audio.mixer_pipe[0] + 1, + &mixer_fdset, NULL, NULL, &delay) < 1) + { + int wait_percent = 90; /* wait 90% of the real playing time */ + int sample_size; + + FD_SET(audio.mixer_pipe[0], &mixer_fdset); + + sample_size = Mixer_Main_SimpleAudio(snd_ctrl); + + delay.tv_sec = 0; + delay.tv_usec = + ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000; + } + + CloseAudioDevice(&audio.device_fd); + + Mixer_InitChannels(); /* remove all sounds from mixer */ + +#endif /* !AUDIO_STREAMING_DSP */ + } } -#endif /* PLATFORM_UNIX */ +#endif /* AUDIO_UNIX_NATIVE */ -#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP) + +#if defined(AUDIO_UNIX_NATIVE) && !defined(AUDIO_STREAMING_DSP) /* these two are stolen from "sox"... :) */ @@ -1099,7 +1297,7 @@ static int ulaw_to_linear(unsigned char ulawbyte) return(sample); } -#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */ +#endif /* AUDIO_UNIX_NATIVE && !AUDIO_STREAMING_DSP */ /* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ @@ -1123,7 +1321,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 @@ -1138,6 +1336,8 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } + snd_info->data_len = ((Mix_Chunk *)snd_info->data_ptr)->alen; + #elif defined(TARGET_ALLEGRO) if ((snd_info->data_ptr = load_sample(filename)) == NULL) @@ -1147,7 +1347,9 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } -#else /* PLATFORM_UNIX */ + snd_info->data_len = ((SAMPLE *)snd_info->data_ptr)->len; + +#else /* AUDIO_UNIX_NATIVE */ if ((file = fopen(filename, MODE_READ)) == NULL) { @@ -1222,7 +1424,7 @@ static SoundInfo *Load_WAV(char *filename) snd_info->format = AUDIO_FORMAT_U8; -#endif /* PLATFORM_UNIX */ +#endif /* AUDIO_UNIX_NATIVE */ snd_info->type = SND_TYPE_WAV; snd_info->source_filename = getStringCopy(filename); @@ -1230,69 +1432,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); - ListNode *node; - - 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. */ - -#if 1 - printf("[sound '%s' already exists (same list entry)]\n", filename); -#endif - - return; - } + char *filename = (*snd_info)->source_filename; -#if 1 - printf("[decrementing reference counter of sound '%s']\n", filename_old); +#if 0 + printf("[decrementing reference counter of sound '%s']\n", filename); #endif 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; } +} - /* check if this sound already exists in the list of sounds */ - node = getNodeFromKey(SoundFileList, filename); - if (node) +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) { -#if 1 + /* 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); + } +} - return; +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) @@ -1309,13 +1529,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) @@ -1393,51 +1617,32 @@ void PlayMusic(int nr) if (!audio.music_available) return; -#if defined(TARGET_SDL) - - nr = nr % num_music; - - if (Music[nr]->type == MUS_TYPE_MOD) - { - Mix_PlayMusic(Music[nr]->data_ptr, -1); - Mix_VolumeMusic(SOUND_MAX_VOLUME); /* must be _after_ Mix_PlayMusic()! */ - } - else /* play WAV music loop */ - { - Mix_Volume(audio.music_channel, SOUND_MAX_VOLUME); - Mix_PlayChannel(audio.music_channel, Music[nr]->data_ptr, -1); - } - -#else - PlaySoundMusic(nr); - -#endif } 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) +void PlaySoundStereo(int nr, int stereo_position) { - PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, PSND_NO_LOOP); + PlaySoundExt(nr, PSND_MAX_VOLUME, stereo_position, 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_position, int state) { - struct SoundControl snd_ctrl = emptySoundControl; + SoundControl snd_ctrl; if (!audio.sound_available || !audio.sound_enabled || @@ -1449,147 +1654,70 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type) else if (volume > PSND_MAX_VOLUME) volume = PSND_MAX_VOLUME; - if (stereo < PSND_MAX_LEFT) - stereo = PSND_MAX_LEFT; - 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 + if (stereo_position < PSND_MAX_LEFT) + stereo_position = PSND_MAX_LEFT; + else if (stereo_position > PSND_MAX_RIGHT) + stereo_position = PSND_MAX_RIGHT; -#if defined(TARGET_SDL) - Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_PlayChannel(-1, Sound[nr]->data_ptr, (loop_type ? -1 : 0)); -#elif defined(PLATFORM_UNIX) - if (audio.soundserver_pid == 0) /* we are child process */ - return; + snd_ctrl.active = TRUE; + snd_ctrl.nr = nr; + snd_ctrl.volume = volume; + snd_ctrl.stereo_position = stereo_position; + snd_ctrl.state = state; - if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0) - { - Error(ERR_WARN, "cannot pipe to child process -- no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; - return; - } -#elif defined(PLATFORM_MSDOS) - sound_handler(snd_ctrl); -#endif + HandleSoundRequest(snd_ctrl); } void FadeMusic(void) { - if (!audio.sound_available) + if (!audio.music_available) return; -#if defined(TARGET_SDL) - Mix_FadeOutMusic(SOUND_FADING_INTERVAL); - Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); -#else - StopSoundExt(-1, SSND_FADE_MUSIC); -#endif + StopSoundExt(-1, SND_CTRL_FADE_MUSIC); } 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) { -#if defined(TARGET_SDL) - if (!audio.sound_available) + if (!audio.music_available) return; - Mix_HaltMusic(); - Mix_HaltChannel(audio.music_channel); -#else - StopSoundExt(-1, SSND_STOP_MUSIC); -#endif + StopSoundExt(-1, SND_CTRL_STOP_MUSIC); } 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; + 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; - -#if defined(TARGET_SDL) - - if (method & SSND_FADING) - { - int i; - - for (i=0; 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) @@ -1701,12 +1833,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(); - else - audio.func_reload_music(); -#elif defined(PLATFORM_UNIX) - if (audio.soundserver_pid == 0) /* we are child process */ - return; - - 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); - 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; - } + ReloadCustomSounds(); +#elif defined(AUDIO_UNIX_NATIVE) + WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_SOUNDS); #endif } -void InitReloadSounds(char *set_name) -{ - InitReloadSoundsOrMusic(set_name, SND_RELOAD_SOUNDS); -} - void InitReloadMusic(char *set_name) { - InitReloadSoundsOrMusic(set_name, SND_RELOAD_MUSIC); + if (!audio.music_available) + return; + +#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO) + ReloadCustomMusic(); +#elif defined(AUDIO_UNIX_NATIVE) + WriteReloadInfoToPipe(set_name, SND_CTRL_RELOAD_MUSIC); +#endif } void FreeSound(void *ptr) @@ -1813,7 +1908,7 @@ void FreeSound(void *ptr) Mix_FreeChunk(sound->data_ptr); #elif defined(TARGET_ALLEGRO) destroy_sample(sound->data_ptr); -#else /* PLATFORM_UNIX */ +#else /* AUDIO_UNIX_NATIVE */ free(sound->data_ptr); #endif } @@ -1838,7 +1933,7 @@ void FreeMusic(MusicInfo *music) Mix_FreeChunk(music->data_ptr); #elif defined(TARGET_ALLEGRO) destroy_sample(music->data_ptr); -#else /* PLATFORM_UNIX */ +#else /* AUDIO_UNIX_NATIVE */ free(music->data_ptr); #endif } @@ -1853,8 +1948,17 @@ void FreeAllSounds() if (Sound == NULL) return; + printf("%s: FREEING SOUNDS ...\n", + IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT"); + for(i=0; i