X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=ceeee1477b532295520d29efda50b861118f410c;hb=77570cca460afce38d688221214f93f0c6d0a8c9;hp=757a7bd5d8aff67305563fa72a5970534f891c2b;hpb=5693fe58c10d1472842ebe3fa45fbc9cf3aef5e4;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 757a7bd5..ceeee147 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2000 Artsoft Entertainment * +* (c) 1994-2001 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -21,72 +21,87 @@ #include "system.h" #include "sound.h" #include "misc.h" +#include "setup.h" +#define IS_PARENT_PROCESS(pid) ((pid) > 0) +#define IS_CHILD_PROCESS(pid) ((pid) == 0) + +struct ListNode +{ + char *key; + void *content; + struct ListNode *next; +}; +typedef struct ListNode ListNode; + +static ListNode *newListNode(void); +static void addNodeToList(ListNode **, char *, void *); +static void deleteNodeFromList(ListNode **, char *, void (*function)(void *)); +static ListNode *getNodeFromKey(ListNode *, char *); +static int getNumNodes(ListNode *); + + +static struct SoundEffectInfo *sound_effect; +static ListNode *SoundFileList = NULL; +static SoundInfo **Sound = NULL; +static MusicInfo **Music = NULL; static int num_sounds = 0, num_music = 0; -static struct SampleInfo *Sound = NULL; -#if defined(TARGET_SDL) -static int num_mods = 0; -static struct SampleInfo *Mod = NULL; -#endif -/*** THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/ +/* ========================================================================= */ +/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ -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 -}; +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 char premix_first_buffer[SND_BLOCKSIZE]; -#if defined(AUDIO_STREAMING_DSP) -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]; -#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); -#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); #endif - -#if defined(PLATFORM_HPUX) -static void HPUX_Audio_Control(); #endif -#if defined(PLATFORM_MSDOS) -static void SoundServer_InsertNewSound(struct SoundControl); -static void SoundServer_StopSound(int); -static void SoundServer_StopAllSounds(); -#endif +static void ReloadCustomSounds(); +static void ReloadCustomMusic(); +static void FreeSound(void *); + + +/* ------------------------------------------------------------------------- */ +/* functions for native (non-SDL) Unix audio/mixer support */ +/* ------------------------------------------------------------------------- */ + +#if defined(AUDIO_UNIX_NATIVE) -#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) @@ -96,21 +111,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"); + 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]; @@ -119,27 +134,22 @@ static boolean TestAudioDevices(void) static boolean ForkAudioProcess(void) { - if (pipe(audio.soundserver_pipe) < 0) + if (pipe(audio.mixer_pipe) < 0) { - Error(ERR_WARN, "cannot create pipe - no sounds"); + 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"); + Error(ERR_WARN, "cannot create sound server process -- no sounds"); return FALSE; } - if (audio.soundserver_pid == 0) /* we are child */ - { - 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; } @@ -156,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) @@ -163,587 +177,1022 @@ void UnixCloseAudio(void) if (audio.device_fd) close(audio.device_fd); - if (audio.soundserver_pid) - kill(audio.soundserver_pid, SIGTERM); + if (IS_PARENT_PROCESS(audio.mixer_pid)) + kill(audio.mixer_pid, SIGTERM); } -#endif /* PLATFORM_UNIX */ -void InitPlaylist(void) + +/* ------------------------------------------------------------------------- */ +/* functions for platform specific audio device initialization */ +/* ------------------------------------------------------------------------- */ + +#if defined(AUDIO_LINUX_IOCTL) +static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) { + /* "ioctl()" expects pointer to 'int' value for stereo flag + (boolean is defined as 'char', which will not work here) */ + unsigned int fragment_spec = 0; + int fragment_size_query; + int stereo = TRUE; + struct + { + int format_ioctl; + int format_result; + } + formats[] = + { + /* supported audio format in preferred order */ + { AFMT_S16_LE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_LE }, + { AFMT_S16_BE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_BE }, + { AFMT_U8, AUDIO_FORMAT_U8 }, + { -1, -1 } + }; int i; - for(i=0;ifragment_size) + fragment_spec++; + + /* use two fragments (play one fragment, prepare the other); + one fragment would result in interrupted audio output, more + than two fragments would raise audio output latency to much */ + fragment_spec |= 0x00020000; + + /* Example for fragment specification: + - 2 buffers / 512 bytes (giving 1/16 second resolution for 8 kHz) + - (with stereo the effective buffer size will shrink to 256) + => fragment_size = 0x00020009 */ + + if (ioctl(audio.device_fd, SNDCTL_DSP_SETFRAGMENT, &fragment_spec) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set fragment size of /dev/dsp -- no sounds"); + + i = 0; + afmt->format = 0; + while (formats[i].format_result != -1) + { + unsigned int audio_format = formats[i].format_ioctl; + if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0) + { + afmt->format = formats[i].format_result; + break; + } + } + + if (afmt->format == 0) /* no supported audio format found */ + Error(ERR_EXIT_SOUND_SERVER, + "cannot set audio format of /dev/dsp -- no sounds"); + + /* try if we can use stereo sound */ + afmt->stereo = TRUE; + if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) + afmt->stereo = FALSE; + + if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->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 */ + if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot get fragment size of /dev/dsp -- no sounds"); + if (fragment_size_query != afmt->fragment_size) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set fragment size of /dev/dsp -- no sounds"); } +#endif /* AUDIO_LINUX_IOCTL */ -void StartSoundserver(void) +#if defined(PLATFORM_NETBSD) +static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) { -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) - if (!ForkAudioProcess()) - audio.sound_available = FALSE; -#endif + audio_info_t a_info; + boolean stereo = TRUE; + + 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; + + afmt->format = 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_UNIX) -void SoundServer(void) +#if defined(PLATFORM_HPUX) +static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) { - int i; + struct audio_describe ainfo; + int audio_ctl; - struct SoundControl snd_ctrl; - fd_set sound_fdset; + 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"); - close(audio.soundserver_pipe[1]); /* no writing into pipe needed */ + ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); + ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); - InitPlaylist(); + afmt->format = AUDIO_FORMAT_U8; + afmt->stereo = FALSE; + afmt->sample_rate = 8000; - stereo_volume[PSND_MAX_LEFT2RIGHT] = 0; - 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 +} - FD_ZERO(&sound_fdset); - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - while(1) /* wait for sound playing commands from client */ - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - select(audio.soundserver_pipe[0] + 1, &sound_fdset, NULL, NULL, NULL); - if (!FD_ISSET(audio.soundserver_pipe[0], &sound_fdset)) - continue; - if (read(audio.soundserver_pipe[0], &snd_ctrl, sizeof(snd_ctrl)) - != sizeof(snd_ctrl)) - Error(ERR_EXIT_SOUND_SERVER, "broken pipe - no sounds"); +/* ------------------------------------------------------------------------- */ +/* functions for communication between main process and sound mixer process */ +/* ------------------------------------------------------------------------- */ -#if defined(AUDIO_STREAMING_DSP) +static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl) +{ + if (IS_CHILD_PROCESS(audio.mixer_pid)) + return; - if (snd_ctrl.fade_sound) - { - if (!playing_sounds) - continue; + 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; + } +} - for(i=0;ifullpath) + 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; - for(i=0;ifullpath, + 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; + } +} - if (!playing_sounds) - close(audio.device_fd); - } +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; +} - if (playing_sounds || snd_ctrl.active) - { - struct timeval delay = { 0, 0 }; - byte *sample_ptr; - long sample_size; - static long max_sample_size = 0; - static long fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; - int sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; - int stereo = TRUE; - /* 'ioctl()' expects pointer to integer value for stereo flag - (boolean is defined as 'char', which will not work here) */ - - if (playing_sounds || - (audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0) - { - if (!playing_sounds) /* we just opened the audio device */ - { - unsigned long fragment_spec = 0; - - /* determine logarithm (log2) of the fragment size */ - for (fragment_spec=0; (1 << fragment_spec) < fragment_size; - fragment_spec++); - - /* use two fragments (play one fragment, prepare the other); - one fragment would result in interrupted audio output, more - than two fragments would raise audio output latency to much */ - fragment_spec |= 0x00020000; - - /* Example for fragment specification: - - 2 buffers / 512 bytes (giving 1/16 second resolution for 8 kHz) - - (with stereo the effective buffer size will shrink to 256) - => fragment_size = 0x00020009 */ - - if (ioctl(audio.device_fd,SNDCTL_DSP_SETFRAGMENT,&fragment_spec) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set fragment size of /dev/dsp - no sounds"); - - /* try if we can use stereo sound */ - if (ioctl(audio.device_fd, 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(audio.device_fd, 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 */ - if (ioctl(audio.device_fd, 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); - } - - 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) - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - /* first clear the last premixing buffer */ - memset(premix_last_buffer, 0, fragment_size * sizeof(int)); - - 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 * (int)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--; - } - } - - /* put last mixing buffer to final playing buffer */ - for(i=0; i255) - playing_buffer[i] = 255; - else - playing_buffer[i] = (premix_last_buffer[i]>>1)^0x80; - } - - /* 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); - } - } +#endif /* AUDIO_UNIX_NATIVE */ -#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; +/* ------------------------------------------------------------------------- */ +/* mixer functions */ +/* ------------------------------------------------------------------------- */ - if ((audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0) - { - playing_sounds = 1; +void Mixer_InitChannels() +{ + int i; - while(playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); + for(i=0; i> PSND_MAX_VOLUME_BITS; +#if defined(TARGET_SDL) + Mix_Volume(channel, SOUND_MAX_VOLUME); + Mix_PlayChannel(channel, mixer[channel].data_ptr, + IS_LOOP(mixer[channel]) ? -1 : 0); +#elif defined(PLATFORM_MSDOS) + mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr); + if (mixer[channel].voice < 0) + return; - for(i=0;i= snd_ctrl.data_len) - playing_sounds = 0; + voice_set_volume(mixer[channel].voice, mixer[channel].volume); + voice_set_pan(mixer[channel].voice, mixer[channel].stereo_position); + voice_start(mixer[channel].voice); +#endif - /* finally play the sound fragment */ - write(audio.device_fd,playing_buffer,sample_size); + mixer[channel].active = TRUE; + mixer_active_channels++; +} - delay.tv_sec = 0; - delay.tv_usec = ((sample_size*10*wait_percent)/(sample_rate))*1000; - } - close(audio.device_fd); - } - } -#endif /* !AUDIO_STREAMING_DSP */ +static void Mixer_PlayMusicChannel() +{ + Mixer_PlayChannel(audio.music_channel); + +#if defined(TARGET_SDL) + if (mixer[audio.music_channel].type != MUS_TYPE_WAV) + { + /* Mix_VolumeMusic() must be called _after_ Mix_PlayMusic() -- + this looks like a bug in the SDL_mixer library */ + Mix_PlayMusic(mixer[audio.music_channel].data_ptr, -1); + Mix_VolumeMusic(SOUND_MAX_VOLUME); } +#endif } -#endif /* PLATFORM_UNIX */ -#if defined(PLATFORM_MSDOS) -static void sound_handler(struct SoundControl snd_ctrl) +static void Mixer_StopChannel(int channel) { - int i; +#if 0 +#if defined(TARGET_SDL) + printf("----------> %d [%d]\n", Mix_Playing(channel), Mix_Playing(0)); +#endif +#endif - if (snd_ctrl.fade_sound) - { - if (!playing_sounds) - return; + if (!mixer[channel].active) + return; - for (i=0; ilongest) - { - longest=actual; - longest_nr=i; - } - } -#if defined(PLATFORM_MSDOS) - voice_set_volume(playlist[longest_nr].voice, 0); - deallocate_voice(playlist[longest_nr].voice); +static void Mixer_FadeMusicChannel() +{ + Mixer_FadeChannel(audio.music_channel); + +#if defined(TARGET_SDL) + Mix_FadeOutMusic(SOUND_FADING_INTERVAL); #endif - playlist[longest_nr] = emptySoundControl; - playing_sounds--; +} + +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=0;i=1 && snd_ctrl.loop) + if (k >= 1 && IS_LOOP(snd_ctrl)) { - for(i=0;i=2) + if (k >= 2) { - int longest=0, longest_nr=0; + unsigned long playing_current = Counter(); + int longest = 0, longest_nr = audio.first_sound_channel; /* look for oldest equal sound */ - for(i=0;i=longest) + + if (actual >= longest) { - longest=actual; - longest_nr=i; + longest = actual; + longest_nr = i; } } -#if defined(PLATFORM_MSDOS) - voice_set_volume(playlist[longest_nr].voice, 0); - deallocate_voice(playlist[longest_nr].voice); + 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); } - /* neuen Sound in Liste packen */ - 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; } } } -#endif /* !PLATFORM_WIN32 */ -/* -void SoundServer_FadeSound(int nr) +static void HandleSoundRequest(SoundControl snd_ctrl) { int i; - if (!playing_sounds) +#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; - for(i=0;iformat == 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 /* PLATFORM_MSDOS */ -#endif /* !PLATFORM_WIN32 */ +#endif /* !AUDIO_STREAMING_DSP */ -#if defined(PLATFORM_HPUX) -static void HPUX_Audio_Control() +void Mixer_Main() { - struct audio_describe ainfo; - int audio_ctl; + SoundControl snd_ctrl; + fd_set mixer_fdset; - audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); - if (audio_ctl == -1) - Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl - no sounds"); + close(audio.mixer_pipe[1]); /* no writing into pipe needed */ - if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - Error(ERR_EXIT_SOUND_SERVER, "no audio info - no sounds"); + Mixer_InitChannels(); - if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) - Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available - no sounds"); +#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 */ + { + struct timeval delay = { 0, 0 }; + + 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; + + ReadSoundControlFromMainProcess(&snd_ctrl); + + HandleSoundRequest(snd_ctrl); + +#if defined(AUDIO_STREAMING_DSP) + + while (mixer_active_channels && + select(audio.mixer_pipe[0] + 1, + &mixer_fdset, NULL, NULL, &delay) < 1) + { + FD_SET(audio.mixer_pipe[0], &mixer_fdset); + + Mixer_Main_DSP(); + } + +#else /* !AUDIO_STREAMING_DSP */ + + if (!snd_ctrl.active || IS_LOOP(snd_ctrl) || + (audio.device_fd = OpenAudioDevice(audio.device_name)) < 0) + continue; + + InitAudioDevice(&afmt); + + 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); - ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); - ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); + Mixer_InitChannels(); /* remove all sounds from mixer */ - close(audio_ctl); +#endif /* !AUDIO_STREAMING_DSP */ + } } -#endif /* PLATFORM_HPUX */ +#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"... :) */ @@ -848,199 +1297,319 @@ static int ulaw_to_linear(unsigned char ulawbyte) return(sample); } -#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */ - -/*** THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/ +#endif /* AUDIO_UNIX_NATIVE && !AUDIO_STREAMING_DSP */ -/*===========================================================================*/ -/*** THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS ***/ +/* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ +/* ========================================================================= */ +/* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS */ #define CHUNK_ID_LEN 4 /* IFF style chunk id length */ -#define WAV_HEADER_SIZE 20 /* size of WAV file header */ +#define WAV_HEADER_SIZE 16 /* size of WAV file header */ -static boolean LoadSoundExt(char *sound_name, boolean is_music) +static SoundInfo *Load_WAV(char *filename) { - struct SampleInfo *snd_info; - char filename[256]; + SoundInfo *snd_info; #if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS) byte sound_header_buffer[WAV_HEADER_SIZE]; - char chunk[CHUNK_ID_LEN + 1]; - int chunk_length, dummy; + char chunk_name[CHUNK_ID_LEN + 1]; + int chunk_size; FILE *file; int i; #endif - num_sounds++; - Sound = checked_realloc(Sound, num_sounds * sizeof(struct SampleInfo)); + if (!audio.sound_available) + return NULL; - snd_info = &Sound[num_sounds - 1]; - snd_info->name = sound_name; +#if 0 + printf("loading WAV file '%s'\n", filename); +#endif - sprintf(filename, "%s/%s/%s", options.ro_base_directory, - (is_music ? MUSIC_DIRECTORY : SOUNDS_DIRECTORY), snd_info->name); + snd_info = checked_calloc(sizeof(SoundInfo)); #if defined(TARGET_SDL) - if ((snd_info->mix_chunk = Mix_LoadWAV(filename)) == NULL) + if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL) { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); - return FALSE; + Error(ERR_WARN, "cannot read sound file '%s'", filename); + free(snd_info); + 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) + { + Error(ERR_WARN, "cannot read sound file '%s'", filename); + free(snd_info); + return NULL; } -#elif defined(PLATFORM_UNIX) + snd_info->data_len = ((SAMPLE *)snd_info->data_ptr)->len; + +#else /* AUDIO_UNIX_NATIVE */ if ((file = fopen(filename, MODE_READ)) == NULL) { - Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename); - return FALSE; + Error(ERR_WARN, "cannot open sound file '%s'", filename); + free(snd_info); + return NULL; } - /* read chunk "RIFF" */ - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk, "RIFF") != 0) + /* read chunk id "RIFF" */ + getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN); + if (strcmp(chunk_name, "RIFF") != 0) { Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); fclose(file); - return FALSE; + free(snd_info); + return NULL; } - /* read chunk "WAVE" */ - getFileChunk(file, chunk, &dummy, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk, "WAVE") != 0) + /* read "RIFF" type id "WAVE" */ + getFileChunk(file, chunk_name, NULL, BYTE_ORDER_LITTLE_ENDIAN); + if (strcmp(chunk_name, "WAVE") != 0) { - Error(ERR_WARN, "missing 'WAVE' chunk of sound file '%s'", filename); + Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename); fclose(file); - return FALSE; + free(snd_info); + return NULL; + } + + while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN)) + { + if (strcmp(chunk_name, "fmt ") == 0) + { + /* read header information */ + for (i=0; i < MIN(chunk_size, WAV_HEADER_SIZE); i++) + sound_header_buffer[i] = fgetc(file); + + if (chunk_size > WAV_HEADER_SIZE) + ReadUnusedBytesFromFile(file, chunk_size - WAV_HEADER_SIZE); + } + else if (strcmp(chunk_name, "data") == 0) + { + snd_info->data_len = chunk_size; + snd_info->data_ptr = checked_malloc(snd_info->data_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 'data' chunk of sound file '%s'",filename); + fclose(file); + free(snd_info->data_ptr); + free(snd_info); + return NULL; + } + + /* check for odd number of sample bytes (data chunk is word aligned) */ + if ((chunk_size % 2) == 1) + ReadUnusedBytesFromFile(file, 1); + } + else /* unknown chunk -- ignore */ + ReadUnusedBytesFromFile(file, chunk_size); } - /* read header information */ - for (i=0; idata_ptr == NULL) { Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename); - fclose(file); - return FALSE; + free(snd_info); + return NULL; } - snd_info->data_len = chunk_length; - snd_info->data_ptr = checked_malloc(snd_info->data_len); + snd_info->format = AUDIO_FORMAT_U8; + +#endif /* AUDIO_UNIX_NATIVE */ - /* read sound data */ - if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) != - snd_info->data_len) + snd_info->type = SND_TYPE_WAV; + snd_info->source_filename = getStringCopy(filename); + + return snd_info; +} + +static void deleteSoundEntry(SoundInfo **snd_info) +{ + if (*snd_info) { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); - fclose(file); - return FALSE; - } + char *filename = (*snd_info)->source_filename; - fclose(file); +#if 0 + printf("[decrementing reference counter of sound '%s']\n", filename); +#endif + + if (--(*snd_info)->num_references <= 0) + { +#if 0 + printf("[deleting sound '%s']\n", filename); +#endif - for (i=0; idata_len; i++) - snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80; + /* + FreeSound(*snd_info); + */ + deleteNodeFromList(&SoundFileList, filename, FreeSound); + } + + *snd_info = NULL; + } +} -#else /* PLATFORM_MSDOS */ +static void replaceSoundEntry(SoundInfo **snd_info, char *filename) +{ + ListNode *node; - snd_info->sample_ptr = load_sample(filename); - if (!snd_info->sample_ptr) + /* check if the old and the new sound file are the same */ + if (*snd_info && strcmp((*snd_info)->source_filename, filename) == 0) { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); - return FALSE; + /* 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 - return TRUE; + *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); + } } -boolean LoadSound(char *sound_name) +static void LoadCustomSound(SoundInfo **snd_info, char *basename) { - return LoadSoundExt(sound_name, FALSE); + char *filename = getCustomSoundFilename(basename); + + if (strcmp(basename, SND_FILE_UNDEFINED) == 0) + { + deleteSoundEntry(snd_info); + return; + } + + if (filename == NULL) + { + Error(ERR_WARN, "cannot find sound file '%s'", basename); + return; + } + + replaceSoundEntry(snd_info, filename); } -boolean LoadMod(char *mod_name) +void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries) { -#if defined(TARGET_SDL) - struct SampleInfo *mod_info; - char filename[256]; + if (Sound == NULL) + Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *)); + + sound_effect = sounds_list; + num_sounds = num_list_entries; +} + +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 +} - num_mods++; - Mod = checked_realloc(Mod, num_mods * sizeof(struct SampleInfo)); +static MusicInfo *Load_MOD(char *filename) +{ +#if defined(TARGET_SDL) + MusicInfo *mod_info; - mod_info = &Mod[num_mods - 1]; - mod_info->name = mod_name; + if (!audio.sound_available) + return NULL; - sprintf(filename, "%s/%s/%s", options.ro_base_directory, - MUSIC_DIRECTORY, mod_info->name); + mod_info = checked_calloc(sizeof(MusicInfo)); - if ((mod_info->mix_music = Mix_LoadMUS(filename)) == NULL) + if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL) { - Error(ERR_WARN, "cannot read music file '%s' - no music", filename); - return FALSE; + Error(ERR_WARN, "cannot read music file '%s'", filename); + free(mod_info); + return NULL; } - return TRUE; + mod_info->type = MUS_TYPE_MOD; + mod_info->source_filename = getStringCopy(filename); + + return mod_info; #else - return FALSE; + return NULL; #endif } -int LoadMusic(void) +void LoadCustomMusic(void) { + char *music_directory = getCustomMusicDirectory(); DIR *dir; struct dirent *dir_entry; - char *music_directory = getPath2(options.ro_base_directory, MUSIC_DIRECTORY); - int num_wav_music = 0; - int num_mod_music = 0; + + if (!audio.sound_available) + return; if ((dir = opendir(music_directory)) == NULL) { Error(ERR_WARN, "cannot read music directory '%s'", music_directory); audio.music_available = FALSE; - free(music_directory); - return 0; + return; } while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ { - char *filename = dir_entry->d_name; + char *basename = dir_entry->d_name; + char *filename = getPath2(music_directory, basename); + MusicInfo *mus_info = NULL; - if (strlen(filename) > 4 && - strcmp(&filename[strlen(filename) - 4], ".wav") == 0) - { - if (LoadSoundExt(filename, TRUE)) - num_wav_music++; - } - else if (strlen(filename) > 4 && - (strcmp(&filename[strlen(filename) - 4], ".mod") == 0 || - strcmp(&filename[strlen(filename) - 4], ".MOD") == 0 || - strncmp(filename, "mod.", 4) == 0 || - strncmp(filename, "MOD.", 4) == 0)) + if (FileIsSound(basename)) + mus_info = Load_WAV(filename); + else if (FileIsMusic(basename)) + mus_info = Load_MOD(filename); + + free(filename); + + if (mus_info) { - if (LoadMod(filename)) - num_mod_music++; + num_music++; + Music = checked_realloc(Music, num_music * sizeof(MusicInfo *)); + Music[num_music -1] = mus_info; } } closedir(dir); - if (num_wav_music == 0 && num_mod_music == 0) + if (num_music == 0) Error(ERR_WARN, "cannot find any valid music files in directory '%s'", music_directory); - - free(music_directory); - - num_music = (num_mod_music > 0 ? num_mod_music : num_wav_music); - - audio.mods_available = (num_mod_music > 0); - audio.music_available = (num_music > 0); - - return num_music; } void PlayMusic(int nr) @@ -1048,195 +1617,370 @@ void PlayMusic(int nr) if (!audio.music_available) return; - if (!audio.mods_available) - nr = num_sounds - num_music + nr; - -#if defined(TARGET_SDL) - if (audio.mods_available) /* play MOD music */ - { - Mix_VolumeMusic(SOUND_MAX_VOLUME); - Mix_PlayMusic(Mod[nr].mix_music, -1); - } - else /* play WAV music loop */ - { - Mix_Volume(audio.music_channel, SOUND_MAX_VOLUME); - Mix_PlayChannel(audio.music_channel, Sound[nr].mix_chunk, -1); - } -#else - audio.music_nr = nr; - PlaySoundLoop(nr); -#endif + PlaySoundMusic(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) +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 PlaySoundExt(int nr, int volume, int stereo, boolean loop) +void PlaySoundMusic(int nr) { - struct SoundControl snd_ctrl = emptySoundControl; + PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC); +} + +void PlaySoundExt(int nr, int volume, int stereo_position, int state) +{ + SoundControl snd_ctrl; - if (!audio.sound_available || !audio.sound_enabled) + if (!audio.sound_available || + !audio.sound_enabled || + audio.sound_deactivated) return; - if (volumePSND_MAX_VOLUME) + else if (volume > PSND_MAX_VOLUME) volume = PSND_MAX_VOLUME; - if (stereoPSND_MAX_RIGHT) - stereo = PSND_MAX_RIGHT; + if (stereo_position < PSND_MAX_LEFT) + stereo_position = PSND_MAX_LEFT; + else if (stereo_position > PSND_MAX_RIGHT) + stereo_position = PSND_MAX_RIGHT; - snd_ctrl.nr = nr; - snd_ctrl.volume = volume; - snd_ctrl.stereo = stereo; - snd_ctrl.loop = loop; - snd_ctrl.active = TRUE; - snd_ctrl.data_ptr = Sound[nr].data_ptr; - snd_ctrl.data_len = Sound[nr].data_len; + snd_ctrl.active = TRUE; + snd_ctrl.nr = nr; + snd_ctrl.volume = volume; + snd_ctrl.stereo_position = stereo_position; + snd_ctrl.state = state; -#if defined(TARGET_SDL) - Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_PlayChannel(-1, Sound[nr].mix_chunk, (loop ? -1 : 0)); -#elif defined(PLATFORM_UNIX) - 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 defined(TARGET_SDL) - if (audio.mods_available) - Mix_FadeOutMusic(SOUND_FADING_INTERVAL); - else - Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); -#else - FadeSound(audio.music_nr); -#endif + if (!audio.music_available) + return; + + StopSoundExt(-1, SND_CTRL_FADE_MUSIC); } void FadeSound(int nr) { - StopSoundExt(nr, SSND_FADE_SOUND); + StopSoundExt(nr, SND_CTRL_FADE_SOUND); } void FadeSounds() { - StopSoundExt(-1, SSND_FADE_ALL_SOUNDS); + FadeMusic(); + StopSoundExt(-1, SND_CTRL_FADE_ALL); } void StopMusic(void) { -#if defined(TARGET_SDL) - if (audio.mods_available) - Mix_HaltMusic(); - else - Mix_HaltChannel(audio.music_channel); -#else - StopSound(audio.music_nr); -#endif + if (!audio.music_available) + return; + + 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_SOUNDS); + 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 (SSND_FADING(method)) - snd_ctrl.fade_sound = TRUE; + snd_ctrl.active = FALSE; + snd_ctrl.nr = nr; + snd_ctrl.state = state; - if (SSND_ALL(method)) - snd_ctrl.stop_all_sounds = TRUE; - else - { - snd_ctrl.nr = nr; - snd_ctrl.stop_sound = TRUE; - } + HandleSoundRequest(snd_ctrl); +} -#if defined(TARGET_SDL) +ListNode *newListNode() +{ + return checked_calloc(sizeof(ListNode)); +} + +void addNodeToList(ListNode **node_first, char *key, void *content) +{ + ListNode *node_new = newListNode(); + +#if 0 + printf("LIST: adding node with key '%s'\n", key); +#endif + + node_new->key = getStringCopy(key); + node_new->content = content; + node_new->next = *node_first; + *node_first = node_new; +} + +void deleteNodeFromList(ListNode **node_first, char *key, + void (*destructor_function)(void *)) +{ + if (node_first == NULL || *node_first == NULL) + return; - if (SSND_FADING(method)) +#if 0 + printf("[CHECKING LIST KEY '%s' == '%s']\n", + (*node_first)->key, key); +#endif + + if (strcmp((*node_first)->key, key) == 0) { - int i; +#if 0 + printf("[DELETING LIST ENTRY]\n"); +#endif - for (i=0; ikey); + if (destructor_function) + destructor_function((*node_first)->content); + *node_first = (*node_first)->next; } else - { - int i; + deleteNodeFromList(&(*node_first)->next, key, destructor_function); +} - for (i=0; ikey, key) == 0) + return node_first; + else + return getNodeFromKey(node_first->next, key); +} + +int getNumNodes(ListNode *node_first) +{ + return (node_first ? 1 + getNumNodes(node_first->next) : 0); +} + +void dumpList(ListNode *node_first) +{ + ListNode *node = node_first; + + while (node) { - Error(ERR_WARN, "cannot pipe to child process - no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; + printf("['%s' (%d)]\n", node->key, + ((SoundInfo *)node->content)->num_references); + node = node->next; + } + + printf("[%d nodes]\n", getNumNodes(node_first)); +} + +static void LoadSoundsInfo() +{ + char *filename = getCustomSoundConfigFilename(); + struct SetupFileList *setup_file_list; + int i; + + /* always start with reliable default values */ + for (i=0; i '%s'\n", sound_effect[i].filename); + else + printf("-> UNDEFINED [-> '%s']\n", sound_effect[i].default_filename); + } +#endif } -#else - sound_handler(snd_ctrl); +} + +static void ReloadCustomSounds() +{ + int i; + +#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; idata_ptr) + { #if defined(TARGET_SDL) - free(Sound[i].mix_chunk); -#elif !defined(PLATFORM_MSDOS) - free(Sound[i].data_ptr); -#else - destroy_sample(Sound[i].sample_ptr); + Mix_FreeChunk(sound->data_ptr); +#elif defined(TARGET_ALLEGRO) + destroy_sample(sound->data_ptr); +#else /* AUDIO_UNIX_NATIVE */ + free(sound->data_ptr); +#endif + } + + if (sound->source_filename) + free(sound->source_filename); + + free(sound); +} + +void FreeMusic(MusicInfo *music) +{ + if (music == NULL) + return; + + if (music->data_ptr) + { +#if defined(TARGET_SDL) + if (music->type == MUS_TYPE_MOD) + Mix_FreeMusic(music->data_ptr); + else + Mix_FreeChunk(music->data_ptr); +#elif defined(TARGET_ALLEGRO) + destroy_sample(music->data_ptr); +#else /* AUDIO_UNIX_NATIVE */ + free(music->data_ptr); #endif + } + + free(music); +} + +void FreeAllSounds() +{ + int i; + + if (Sound == NULL) + return; + + printf("%s: FREEING SOUNDS ...\n", + IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT"); + + for(i=0; i