X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=c9a74eb1b262056ec279873861f8511148f074a4;hp=fbdbd87d9716fb569440219ccecac4bdaf861388;hb=39fb4fecfb8d4647d3563bdb18ce0065f6129522;hpb=2eeb33b85d7394bd58f51bdc430894f97f8ee6f5 diff --git a/src/libgame/sound.c b/src/libgame/sound.c index fbdbd87d..c9a74eb1 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,852 +1,361 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* sound.c * -***********************************************************/ - -#include +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// sound.c +// ============================================================================ + +#include #include +#include #include #include #include #include +#include +#include +#include "platform.h" #include "system.h" #include "sound.h" #include "misc.h" #include "setup.h" +#include "text.h" -struct ListNode -{ - char *key; - void *content; - struct ListNode *next; -}; -typedef struct ListNode ListNode; +/* expiration time (in milliseconds) for sound loops */ +#define SOUND_LOOP_EXPIRATION_TIME 200 -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 *); +/* one second fading interval == 1000 ticks (milliseconds) */ +#define SOUND_FADING_INTERVAL 1000 +#define SND_TYPE_NONE 0 +#define SND_TYPE_WAV 1 -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; +#define MUS_TYPE_NONE 0 +#define MUS_TYPE_WAV 1 +#define MUS_TYPE_MOD 2 +#define DEVICENAME_DSP "/dev/dsp" +#define DEVICENAME_SOUND_DSP "/dev/sound/dsp" +#define DEVICENAME_AUDIO "/dev/audio" +#define DEVICENAME_AUDIOCTL "/dev/audioCtl" -/* ========================================================================= */ -/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ +#define SOUND_VOLUME_LEFT(x) (stereo_volume[x]) +#define SOUND_VOLUME_RIGHT(x) (stereo_volume[SOUND_MAX_LEFT2RIGHT-x]) -static struct AudioFormatInfo afmt = -{ - TRUE, 0, DEFAULT_AUDIO_SAMPLE_RATE, DEFAULT_AUDIO_FRAGMENT_SIZE -}; +#define SAME_SOUND_NR(x,y) ((x).nr == (y).nr) +#define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr) -static int playing_sounds = 0; -static struct SoundControl playlist[NUM_MIXER_CHANNELS]; -static struct SoundControl emptySoundControl = -{ -#if 1 - FALSE, -1, 0, 0, FALSE, 0, 0, 0, NULL -#else - -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0, 0,NULL -#endif -}; +#define SOUND_VOLUME_FROM_PERCENT(v,p) ((p) < 0 ? SOUND_MIN_VOLUME : \ + (p) > 100 ? (v) : \ + (p) * (v) / 100) -/* forward declaration of internal functions */ -static void SoundServer_InsertNewSound(struct SoundControl); -static void InitAudioDevice(struct AudioFormatInfo *); +#define SOUND_VOLUME_SIMPLE(v) SOUND_VOLUME_FROM_PERCENT(v, setup.volume_simple) +#define SOUND_VOLUME_LOOPS(v) SOUND_VOLUME_FROM_PERCENT(v, setup.volume_loops) +#define SOUND_VOLUME_MUSIC(v) SOUND_VOLUME_FROM_PERCENT(v, setup.volume_music) -#if defined(PLATFORM_UNIX) -#if !defined(AUDIO_STREAMING_DSP) -static unsigned char linear_to_ulaw(int); -static int ulaw_to_linear(unsigned char); -#endif -#elif defined(PLATFORM_MSDOS) -static void SoundServer_InsertNewSound(struct SoundControl); -static void SoundServer_StopSound(struct SoundControl); -static void SoundServer_StopAllSounds(); -#endif +#define SETUP_SOUND_VOLUME(v,s) ((s) & SND_CTRL_MUSIC ? \ + SOUND_VOLUME_MUSIC(v) : \ + (s) & SND_CTRL_LOOP ? \ + SOUND_VOLUME_LOOPS(v) : \ + SOUND_VOLUME_SIMPLE(v)) -static void ReloadCustomSounds(); -static void ReloadCustomMusic(); -static void FreeSound(void *); +struct AudioFormatInfo +{ + boolean stereo; /* availability of stereo sound */ + int format; /* size and endianess of sample data */ + int sample_rate; /* sample frequency */ + int fragment_size; /* audio device fragment size in bytes */ +}; -#if defined(PLATFORM_UNIX) -static int OpenAudioDevice(char *audio_device_name) +struct SampleInfo { - int audio_device_fd; + char *source_filename; + int num_references; - /* check if desired audio device is accessible */ - if (access(audio_device_name, W_OK) != 0) - return -1; + int type; + int format; + void *data_ptr; /* pointer to first sample (8 or 16 bit) */ + int data_len; /* number of samples, NOT number of bytes */ + int num_channels; /* mono: 1 channel, stereo: 2 channels */ +}; +typedef struct SampleInfo SoundInfo; +typedef struct SampleInfo MusicInfo; - /* try to open audio device in non-blocking mode */ - if ((audio_device_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0) - return audio_device_fd; +struct SoundControl +{ + boolean active; - /* re-open audio device in blocking mode */ - close(audio_device_fd); - audio_device_fd = open(audio_device_name, O_WRONLY); + int nr; + int volume; + int stereo_position; - return audio_device_fd; -} + int state; -static void CloseAudioDevice(int *audio_device_fd) -{ - if (*audio_device_fd == 0) - return; + unsigned int playing_starttime; + unsigned int playing_pos; - close(*audio_device_fd); - *audio_device_fd = -1; -} + int type; + int format; + void *data_ptr; /* pointer to first sample (8 or 16 bit) */ + int data_len; /* number of samples, NOT number of bytes */ + int num_channels; /* mono: 1 channel, stereo: 2 channels */ +}; +typedef struct SoundControl SoundControl; -static boolean TestAudioDevices(void) -{ - static char *audio_device_name[] = - { - DEVICENAME_DSP, - DEVICENAME_AUDIO - }; - int audio_device_fd = -1; - int i; +static struct ArtworkListInfo *sound_info = NULL; +static struct ArtworkListInfo *music_info = NULL; - /* look for available audio devices, starting with preferred ones */ - for (i=0; i= 0) - break; +static MusicInfo **Music_NoConf = NULL; - if (audio_device_fd < 0) - { - Error(ERR_WARN, "cannot open audio device -- no sound"); - return FALSE; - } +static int num_music_noconf = 0; +static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; - close(audio_device_fd); +static char *currently_playing_music_filename = NULL; - audio.device_name = audio_device_name[i]; - return TRUE; -} +/* ========================================================================= */ +/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ -#if !defined(TARGET_SDL) -static boolean ForkAudioProcess(void) -{ - if (pipe(audio.soundserver_pipe) < 0) - { - Error(ERR_WARN, "cannot create pipe -- no sounds"); - return FALSE; - } +static struct SoundControl mixer[NUM_MIXER_CHANNELS]; +static int mixer_active_channels = 0; +static boolean expire_loop_sounds = FALSE; - if ((audio.soundserver_pid = fork()) < 0) - { - Error(ERR_WARN, "cannot create sound server process -- no sounds"); - return FALSE; - } +static void ReloadCustomSounds(); +static void ReloadCustomMusic(); +static void FreeSound(void *); +static void FreeMusic(void *); +static void FreeAllMusic_NoConf(); - if (audio.soundserver_pid == 0) /* we are child process */ - { - SoundServer(); +static SoundInfo *getSoundInfoEntryFromSoundID(int); +static MusicInfo *getMusicInfoEntryFromMusicID(int); - /* never reached */ - exit(0); - } - else /* we are parent */ - close(audio.soundserver_pipe[0]); /* no reading from pipe needed */ - return TRUE; -} -#endif +/* ------------------------------------------------------------------------- */ +/* mixer functions */ +/* ------------------------------------------------------------------------- */ -void UnixOpenAudio(void) +void Mixer_InitChannels() { - if (!TestAudioDevices()) - return; - - audio.sound_available = TRUE; - audio.sound_enabled = TRUE; + int i; -#if defined(AUDIO_STREAMING_DSP) - audio.music_available = TRUE; - audio.loops_available = TRUE; -#endif + for (i = 0; i < audio.num_channels; i++) + mixer[i].active = FALSE; + mixer_active_channels = 0; } -void UnixCloseAudio(void) +static void Mixer_ResetChannelExpiration(int channel) { - if (audio.device_fd) - close(audio.device_fd); + mixer[channel].playing_starttime = Counter(); - if (audio.soundserver_pid > 0) /* we are parent process */ - kill(audio.soundserver_pid, SIGTERM); + if (expire_loop_sounds && + IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel])) + Mix_ExpireChannel(channel, SOUND_LOOP_EXPIRATION_TIME); } -#endif /* PLATFORM_UNIX */ -void InitPlaylist(void) +static boolean Mixer_ChannelExpired(int channel) { - int i; + if (!mixer[channel].active) + return TRUE; + + if (expire_loop_sounds && + IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) && + DelayReached(&mixer[channel].playing_starttime, + SOUND_LOOP_EXPIRATION_TIME)) + return TRUE; - for(i=0; ifullpath) + 1; - unsigned long str_size2 = strlen(ti->basepath) + 1; - unsigned long str_size3 = strlen(ti->fullpath) + 1; - - snd_ctrl.state = type; - snd_ctrl.data_len = strlen(set_name) + 1; - - if (write(audio.soundserver_pipe[1], &snd_ctrl, - sizeof(snd_ctrl)) < 0 || - write(audio.soundserver_pipe[1], set_name, - snd_ctrl.data_len) < 0 || - write(audio.soundserver_pipe[1], leveldir_current, - sizeof(TreeInfo)) < 0 || - write(audio.soundserver_pipe[1], ti, - sizeof(TreeInfo)) < 0 || - write(audio.soundserver_pipe[1], &str_size1, - sizeof(unsigned long)) < 0 || - write(audio.soundserver_pipe[1], &str_size2, - sizeof(unsigned long)) < 0 || - write(audio.soundserver_pipe[1], &str_size3, - sizeof(unsigned long)) < 0 || - write(audio.soundserver_pipe[1], leveldir_current->fullpath, - str_size1) < 0 || - write(audio.soundserver_pipe[1], ti->basepath, - str_size2) < 0 || - write(audio.soundserver_pipe[1], ti->fullpath, - str_size3) < 0) - { - Error(ERR_WARN, "cannot pipe to child process -- no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; - return; - } + Mix_Volume(channel, mixer[channel].volume); + Mix_SetPanning(channel, + SOUND_VOLUME_LEFT(mixer[channel].stereo_position), + SOUND_VOLUME_RIGHT(mixer[channel].stereo_position)); } -static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl) +static void Mixer_StartChannel(int channel) { - TreeInfo **ti_ptr = ((snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) ? - &artwork.snd_current : &artwork.mus_current); - TreeInfo *ti = *ti_ptr; - unsigned long str_size1, str_size2, str_size3; - static char *set_name = NULL; - - if (set_name) - free(set_name); - - set_name = checked_malloc(snd_ctrl.data_len); - - if (leveldir_current == NULL) - leveldir_current = checked_calloc(sizeof(TreeInfo)); - if (ti == NULL) - ti = *ti_ptr = checked_calloc(sizeof(TreeInfo)); - if (leveldir_current->fullpath != NULL) - free(leveldir_current->fullpath); - if (ti->basepath != NULL) - free(ti->basepath); - if (ti->fullpath != NULL) - free(ti->fullpath); - - if (read(audio.soundserver_pipe[0], set_name, - snd_ctrl.data_len) != snd_ctrl.data_len || - read(audio.soundserver_pipe[0], leveldir_current, - sizeof(TreeInfo)) != sizeof(TreeInfo) || - read(audio.soundserver_pipe[0], ti, - sizeof(TreeInfo)) != sizeof(TreeInfo) || - read(audio.soundserver_pipe[0], &str_size1, - sizeof(unsigned long)) != sizeof(unsigned long) || - read(audio.soundserver_pipe[0], &str_size2, - sizeof(unsigned long)) != sizeof(unsigned long) || - read(audio.soundserver_pipe[0], &str_size3, - sizeof(unsigned long)) != sizeof(unsigned long)) - Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); - - leveldir_current->fullpath = checked_calloc(str_size1); - ti->basepath = checked_calloc(str_size2); - ti->fullpath = checked_calloc(str_size3); - - if (read(audio.soundserver_pipe[0], leveldir_current->fullpath, - str_size1) != str_size1 || - read(audio.soundserver_pipe[0], ti->basepath, - str_size2) != str_size2 || - read(audio.soundserver_pipe[0], ti->fullpath, - str_size3) != str_size3) - Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); - - if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) - artwork.sounds_set_current = set_name; - else - artwork.music_set_current = set_name; + Mix_PlayChannel(channel, mixer[channel].data_ptr, + IS_LOOP(mixer[channel]) ? -1 : 0); } -static void HandleSoundRequest(struct SoundControl snd_ctrl) +static void Mixer_PlayChannel(int channel) { - int i; + /* start with inactive channel in case something goes wrong */ + mixer[channel].active = FALSE; - if (IS_RELOADING(snd_ctrl)) /* load new sound or music files */ - { - ReadReloadInfoFromPipe(snd_ctrl); - InitPlaylist(); - CloseAudioDevice(&audio.device_fd); + if (mixer[channel].type != MUS_TYPE_WAV) + return; - if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) - ReloadCustomSounds(); - else - ReloadCustomMusic(); - } - else if (IS_FADING(snd_ctrl)) /* fade out existing sound or music */ - { - if (!playing_sounds) - return; + if (!Mixer_AllocateChannel(channel)) + return; - if (IS_MUSIC(snd_ctrl)) - { - playlist[MUSIC_CHANNEL].state |= SND_CTRL_FADE; - return; - } + Mixer_SetChannelProperties(channel); + Mixer_StartChannel(channel); - for(i=FIRST_SOUND_CHANNEL; i workaround: always play MIDI music with maximum volume + if (Mix_GetMusicType(NULL) == MUS_MID) + Mix_VolumeMusic(SOUND_MAX_VOLUME); +#endif } } -#endif -void StartSoundserver(void) +static void Mixer_StopChannel(int channel) { - if (!audio.sound_available) + if (!mixer[channel].active) return; -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) - if (!ForkAudioProcess()) - audio.sound_available = FALSE; -#endif -} - -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) - -static void CopySampleToMixingBuffer(struct SoundControl *snd_ctrl, - int sample_pos, int sample_size, - short *buffer_ptr) -{ - void *sample_ptr = snd_ctrl->data_ptr; - int i; + Mix_HaltChannel(channel); - if (snd_ctrl->format == AUDIO_FORMAT_U8) - for (i=0; i= SOUND_FADING_VOLUME_THRESHOLD) - playlist[i].volume -= SOUND_FADING_VOLUME_STEP; - - /* adjust volume of actual sound sample */ - if (playlist[i].volume != PSND_MAX_VOLUME) - for(j=0; j> PSND_MAX_VOLUME_BITS; - - /* fill the last mixing buffer with stereo or mono sound */ - if (stereo) - { - int middle_pos = PSND_MAX_LEFT2RIGHT / 2; - int left_volume = stereo_volume[middle_pos + playlist[i].stereo]; - int right_volume= stereo_volume[middle_pos - playlist[i].stereo]; - - for(j=0; j> PSND_MAX_LEFT2RIGHT_BITS; - premix_right_buffer[j] = - (right_volume * premix_first_buffer[j]) - >> PSND_MAX_LEFT2RIGHT_BITS; - - premix_last_buffer[2 * j + 0] += premix_left_buffer[j]; - premix_last_buffer[2 * j + 1] += premix_right_buffer[j]; - } - } - else - { - for(j=0; j= playlist[i].data_len) - { - if (IS_LOOP(playlist[i])) - playlist[i].playingpos = 0; - else - PlaylistRemoveSound(i); - } - else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD) - PlaylistRemoveSound(i); - } - - /* prepare final playing buffer according to system audio format */ - for(i=0; i 65535) - premix_last_buffer[i] = 65535; + Mixer_StopChannel(audio.music_channel); - /* 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); + Mix_HaltMusic(); - if (!playing_sounds) - CloseAudioDevice(&audio.device_fd); + setString(¤tly_playing_music_filename, NULL); } -#else /* !AUDIO_STREAMING_DSP */ - -static int SoundServer_SimpleAudio(struct SoundControl snd_ctrl) +static void Mixer_FadeChannel(int channel) { - static short premix_first_buffer[SND_BLOCKSIZE]; - static byte playing_buffer[SND_BLOCKSIZE]; - int max_sample_size = SND_BLOCKSIZE; - void *sample_ptr; - int sample_len; - int sample_pos; - int sample_size; - int i, j; - - i = 1; - - /* pointer, lenght and actual playing position of sound sample */ - sample_ptr = playlist[i].data_ptr; - sample_len = playlist[i].data_len; - sample_pos = playlist[i].playingpos; - sample_size = MIN(max_sample_size, sample_len - sample_pos); - playlist[i].playingpos += sample_size; - - /* copy original sample to first mixing buffer */ - CopySampleToMixingBuffer(&playlist[i], sample_pos, sample_size, - premix_first_buffer); - - /* adjust volume of actual sound sample */ - if (playlist[i].volume != PSND_MAX_VOLUME) - for(j=0; j> PSND_MAX_VOLUME_BITS; - - /* might be needed for u-law /dev/audio */ -#if 0 - for(j=0; j= playlist[i].data_len) - PlaylistRemoveSound(i); - - for(i=0; i> 8) ^ 0x80; + if (!mixer[channel].active) + return; - /* finally play the sound fragment */ - write(audio.device_fd, playing_buffer, sample_size); + mixer[channel].state |= SND_CTRL_FADE; - return sample_size; + Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL); } -#endif /* !AUDIO_STREAMING_DSP */ -void SoundServer() +static void Mixer_FadeMusicChannel() { - struct SoundControl snd_ctrl; - fd_set sound_fdset; - - close(audio.soundserver_pipe[1]); /* no writing into pipe needed */ + Mixer_FadeChannel(audio.music_channel); - InitPlaylist(); + Mix_FadeOutMusic(SOUND_FADING_INTERVAL); -#if defined(PLATFORM_HPUX) - InitAudioDevice(&afmt); +#if defined(PLATFORM_WIN32) + // playing MIDI music is broken since Windows Vista, as it sets the volume + // for MIDI music also for all other sounds and music, which cannot be set + // back to normal unless playing MIDI music again with that desired volume + // (more details: https://www.artsoft.org/forum/viewtopic.php?f=7&t=2253) + // => workaround: never fade MIDI music to lower volume, but just stop it + if (Mix_GetMusicType(NULL) == MUS_MID) + Mixer_StopMusicChannel(); #endif - FD_ZERO(&sound_fdset); - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - while(1) /* wait for sound playing commands from client */ - { - struct timeval delay = { 0, 0 }; - - 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"); - - HandleSoundRequest(snd_ctrl); - -#if defined(AUDIO_STREAMING_DSP) - - while (playing_sounds && select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - SoundServer_Mixer(); - } - -#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 (playing_sounds && select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - int wait_percent = 90; /* wait 90% of the real playing time */ - int sample_size; - - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - sample_size = SoundServer_SimpleAudio(snd_ctrl); - - delay.tv_sec = 0; - delay.tv_usec = - ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000; - } - - CloseAudioDevice(&audio.device_fd); - - /* delete all sounds from playlist */ - InitPlaylist(); - -#endif /* !AUDIO_STREAMING_DSP */ - } + setString(¤tly_playing_music_filename, NULL); } -#endif /* PLATFORM_UNIX */ -#if defined(PLATFORM_MSDOS) -static void sound_handler(struct SoundControl snd_ctrl) +static void Mixer_UnFadeChannel(int channel) { - int i; - - if (snd_ctrl.fade_sound) - { - if (!playing_sounds) - return; - - for (i=0; i= num_sounds) - return; + snd_info = getMusicInfoEntryFromMusicID(snd_ctrl.nr); + else + snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr); - snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]); if (snd_info == NULL) - { -#if 0 - printf("sound/music %d undefined\n", snd_ctrl.nr); -#endif return; - } -#if 0 - printf("-> %d\n", playing_sounds); -#endif + /* 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; + snd_ctrl.num_channels = snd_info->num_channels; - if (playing_sounds == NUM_MIXER_CHANNELS) + /* play music samples on a dedicated music channel */ + if (IS_MUSIC(snd_ctrl)) { - for (i=0; isource_filename)); - if (!IS_LOOP(playlist[i]) && actual > 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--; + return; } - /* check if sound is already being played (and how often) */ - for (k=0, i=FIRST_SOUND_CHANNEL; i= 1 && IS_LOOP(snd_ctrl)) + /* reset expiration delay for already playing loop sounds */ + if (k > 0 && IS_LOOP(snd_ctrl)) { - for(i=FIRST_SOUND_CHANNEL; i= 2) { - int longest = 0, longest_nr = 0; + unsigned int playing_current = Counter(); + int longest = 0, longest_nr = audio.first_sound_channel; /* look for oldest equal sound */ - for(i=FIRST_SOUND_CHANNEL; i= longest) { longest = actual; @@ -878,706 +386,535 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl) } } -#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--; + Mixer_StopChannel(longest_nr); } - /* add new sound to playlist */ - for(i=0; idata_ptr; - snd_ctrl.data_len = snd_info->data_len; - snd_ctrl.format = snd_info->format; - -#if 1 - if (snd_info->data_len == 0) - { - printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n"); - } -#endif - -#if 1 - if (IS_MUSIC(snd_ctrl) && i == MUSIC_CHANNEL && playlist[i].active) + if (!mixer[i].active) { - printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n"); + Error(ERR_INFO, "Mixer_InsertSound: Channel %d inactive", i); + Error(ERR_INFO, "Mixer_InsertSound: This should never happen!"); -#if 1 - playlist[i] = emptySoundControl; - playing_sounds--; -#endif + mixer_active_channels--; } + } + } #endif - playlist[i] = snd_ctrl; - playing_sounds++; + if (mixer_active_channels == + audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1)) + { + unsigned int playing_current = Counter(); + int longest = 0, longest_nr = audio.first_sound_channel; -#if 0 - printf("NEW SOUND %d ADDED TO PLAYLIST\n", snd_ctrl.nr); -#endif + for (i = audio.first_sound_channel; i < audio.num_channels; i++) + { + int playing_time = playing_current - mixer[i].playing_starttime; + int actual = 1000 * playing_time / mixer[i].data_len; -#if defined(PLATFORM_MSDOS) - playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr); + if (!IS_LOOP(mixer[i]) && actual > longest) + { + longest = actual; + longest_nr = i; + } + } - if (snd_ctrl.loop) - voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP); + Mixer_StopChannel(longest_nr); + } + + /* add the new sound to the mixer */ + for (i = audio.first_sound_channel; i < audio.num_channels; i++) + { + if (!mixer[i].active) + { + mixer[i] = snd_ctrl; + Mixer_PlayChannel(i); - 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) +static void HandleSoundRequest(SoundControl snd_ctrl) { int i; - if (!playing_sounds) - return; - - for(i=0;ifragment_size) - fragment_spec++; +#define CHUNK_ID_LEN 4 /* IFF style chunk id length */ +#define WAV_HEADER_SIZE 16 /* size of WAV file header */ - /* 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; +static void *Load_WAV(char *filename) +{ + SoundInfo *snd_info; - /* 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 (!audio.sound_available) + return NULL; - 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"); + snd_info = checked_calloc(sizeof(SoundInfo)); - i = 0; - afmt->format = 0; - while (formats[i].format_result != -1) + if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL) { - 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; - } + Error(ERR_WARN, "cannot read sound file '%s': %s", filename, Mix_GetError()); + free(snd_info); + return NULL; } - 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"); + snd_info->data_len = ((Mix_Chunk *)snd_info->data_ptr)->alen; + + snd_info->type = SND_TYPE_WAV; + snd_info->source_filename = getStringCopy(filename); + + return snd_info; } -#endif /* AUDIO_LINUX_IOCTL */ -#if defined(PLATFORM_NETBSD) -static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) +static void *Load_MOD(char *filename) { - audio_info_t a_info; - boolean stereo = TRUE; + MusicInfo *mod_info; - 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; + if (!audio.sound_available) + return NULL; - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = TRUE; + mod_info = checked_calloc(sizeof(MusicInfo)); - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL) { - /* try to disable stereo */ - a_info.play.channels = 1; + Error(ERR_WARN, "cannot read music file '%s': %s", filename, Mix_GetError()); + free(mod_info); + return NULL; + } - afmt->stereo = FALSE; + mod_info->type = MUS_TYPE_MOD; + mod_info->source_filename = getStringCopy(filename); - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/audio -- no sounds"); - } + return mod_info; } -#endif /* PLATFORM_NETBSD */ -#if defined(PLATFORM_HPUX) -static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) +static void *Load_WAV_or_MOD(char *filename) { - 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 (FileIsMusic(filename)) + return Load_MOD(filename); + else if (FileIsSound(filename)) + return Load_WAV(filename); + else + return NULL; +} - if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds"); +void LoadCustomMusic_NoConf(void) +{ + static boolean draw_init_text = TRUE; /* only draw at startup */ + static char *last_music_directory = NULL; + char *music_directory = getCustomMusicDirectory(); + Directory *dir; + DirectoryEntry *dir_entry; + int num_music = getMusicListSize(); - if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) - Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds"); + if (!audio.sound_available) + return; - ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); - ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); + if (last_music_directory != NULL && + strEqual(last_music_directory, music_directory)) + return; /* old and new music directory are the same */ - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = FALSE; - afmt->sample_rate = 8000; + if (last_music_directory != NULL) + free(last_music_directory); + last_music_directory = getStringCopy(music_directory); - close(audio_ctl); -} -#endif /* PLATFORM_HPUX */ + FreeAllMusic_NoConf(); -#if defined(PLATFORM_UNIX) -static void InitAudioDevice(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); -#else - /* generic /dev/audio stuff might be placed here */ -#endif -} -#endif /* PLATFORM_UNIX */ - -#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP) - -/* these two are stolen from "sox"... :) */ - -/* -** This routine converts from linear to ulaw. -** -** Craig Reese: IDA/Supercomputing Research Center -** Joe Campbell: Department of Defense -** 29 September 1989 -** -** References: -** 1) CCITT Recommendation G.711 (very difficult to follow) -** 2) "A New Digital Technique for Implementation of Any -** Continuous PCM Companding Law," Villeret, Michel, -** et al. 1973 IEEE Int. Conf. on Communications, Vol 1, -** 1973, pg. 11.12-11.17 -** 3) MIL-STD-188-113,"Interoperability and Performance Standards -** for Analog-to_Digital Conversion Techniques," -** 17 February 1987 -** -** Input: Signed 16 bit linear sample -** Output: 8 bit ulaw sample -*/ - -#define ZEROTRAP /* turn on the trap as per the MIL-STD */ -#define BIAS 0x84 /* define the add-in bias for 16 bit samples */ -#define CLIP 32635 - -static unsigned char linear_to_ulaw(int sample) -{ - static int exp_lut[256] = + if ((dir = openDirectory(music_directory)) == NULL) { - 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3, - 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 - }; - - int sign, exponent, mantissa; - unsigned char ulawbyte; - - /* Get the sample into sign-magnitude. */ - sign = (sample >> 8) & 0x80; /* set aside the sign */ - if (sign != 0) - sample = -sample; /* get magnitude */ - if (sample > CLIP) - sample = CLIP; /* clip the magnitude */ - - /* Convert from 16 bit linear to ulaw. */ - sample = sample + BIAS; - exponent = exp_lut[( sample >> 7 ) & 0xFF]; - mantissa = ( sample >> ( exponent + 3 ) ) & 0x0F; - ulawbyte = ~ ( sign | ( exponent << 4 ) | mantissa ); -#ifdef ZEROTRAP - if (ulawbyte == 0) - ulawbyte = 0x02; /* optional CCITT trap */ -#endif - - return(ulawbyte); -} + Error(ERR_WARN, "cannot read music directory '%s'", music_directory); -/* -** This routine converts from ulaw to 16 bit linear. -** -** Craig Reese: IDA/Supercomputing Research Center -** 29 September 1989 -** -** References: -** 1) CCITT Recommendation G.711 (very difficult to follow) -** 2) MIL-STD-188-113,"Interoperability and Performance Standards -** for Analog-to_Digital Conversion Techniques," -** 17 February 1987 -** -** Input: 8 bit ulaw sample -** Output: signed 16 bit linear sample -*/ - -static int ulaw_to_linear(unsigned char ulawbyte) -{ - static int exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 }; - int sign, exponent, mantissa, sample; - - ulawbyte = ~ ulawbyte; - sign = ( ulawbyte & 0x80 ); - exponent = ( ulawbyte >> 4 ) & 0x07; - mantissa = ulawbyte & 0x0F; - sample = exp_lut[exponent] + ( mantissa << ( exponent + 3 ) ); - if (sign != 0) - sample = -sample; - - return(sample); -} -#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */ + audio.music_available = FALSE; + return; + } -/* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ -/* ========================================================================= */ -/* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS */ + if (draw_init_text) + DrawInitText("Loading music", 120, FC_GREEN); -#define CHUNK_ID_LEN 4 /* IFF style chunk id length */ -#define WAV_HEADER_SIZE 16 /* size of WAV file header */ + while ((dir_entry = readDirectory(dir)) != NULL) /* loop all entries */ + { + char *basename = dir_entry->basename; + MusicInfo *mus_info = NULL; + boolean music_already_used = FALSE; + int i; -static SoundInfo *Load_WAV(char *filename) -{ - SoundInfo *snd_info; -#if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS) - byte sound_header_buffer[WAV_HEADER_SIZE]; - char chunk_name[CHUNK_ID_LEN + 1]; - int chunk_size; - FILE *file; - int i; -#endif + /* skip all music files that are configured in music config file */ + for (i = 0; i < num_music; i++) + { + struct FileInfo *music = getMusicListEntry(i); - if (!audio.sound_available) - return NULL; + if (strEqual(basename, music->filename)) + { + music_already_used = TRUE; + break; + } + } -#if 0 - printf("loading WAV file '%s'\n", filename); -#endif + if (music_already_used) + continue; - snd_info = checked_calloc(sizeof(SoundInfo)); + if (draw_init_text) + DrawInitText(basename, 150, FC_YELLOW); -#if defined(TARGET_SDL) + if (FileIsMusic(dir_entry->filename)) + mus_info = Load_WAV_or_MOD(dir_entry->filename); - if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL) - { - Error(ERR_WARN, "cannot read sound file '%s'", filename); - free(snd_info); - return NULL; + if (mus_info) + { + num_music_noconf++; + Music_NoConf = checked_realloc(Music_NoConf, + num_music_noconf * sizeof(MusicInfo *)); + Music_NoConf[num_music_noconf - 1] = mus_info; + } } -#elif defined(TARGET_ALLEGRO) + closeDirectory(dir); - if ((snd_info->data_ptr = load_sample(filename)) == NULL) - { - Error(ERR_WARN, "cannot read sound file '%s'", filename); - free(snd_info); - return NULL; - } + draw_init_text = FALSE; +} -#else /* PLATFORM_UNIX */ +int getSoundListSize() +{ + return (sound_info->num_file_list_entries + + sound_info->num_dynamic_file_list_entries); +} - if ((file = fopen(filename, MODE_READ)) == NULL) - { - Error(ERR_WARN, "cannot open sound file '%s'", filename); - free(snd_info); - return NULL; - } +int getMusicListSize() +{ + return (music_info->num_file_list_entries + + music_info->num_dynamic_file_list_entries); +} - /* 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); - free(snd_info); +struct FileInfo *getSoundListEntry(int pos) +{ + int num_sounds = getSoundListSize(); + int num_list_entries = sound_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); + + if (pos < 0 || pos >= num_sounds) /* invalid sound */ return NULL; - } - /* 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' type ID of sound file '%s'", filename); - fclose(file); - free(snd_info); + return (pos < num_list_entries ? &sound_info->file_list[list_pos] : + &sound_info->dynamic_file_list[list_pos]); +} + +struct FileInfo *getMusicListEntry(int pos) +{ + int num_music = getMusicListSize(); + int num_list_entries = music_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); + + if (pos < 0 || pos >= num_music) /* invalid music */ 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); + return (pos < num_list_entries ? &music_info->file_list[list_pos] : + &music_info->dynamic_file_list[list_pos]); +} - 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); +static SoundInfo *getSoundInfoEntryFromSoundID(int pos) +{ + int num_sounds = getSoundListSize(); + int num_list_entries = sound_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); + SoundInfo **snd_info = + (SoundInfo **)(pos < num_list_entries ? sound_info->artwork_list : + sound_info->dynamic_artwork_list); - /* 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; - } + if (pos < 0 || pos >= num_sounds) /* invalid sound */ + return NULL; + + return snd_info[list_pos]; +} - /* 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); - } +static MusicInfo *getMusicInfoEntryFromMusicID(int pos) +{ + int num_music = getMusicListSize(); + int num_list_entries = music_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); + MusicInfo **mus_info = + (MusicInfo **)(pos < num_list_entries ? music_info->artwork_list : + music_info->dynamic_artwork_list); - fclose(file); + if (pos >= num_music) /* invalid music */ + return NULL; - if (snd_info->data_ptr == NULL) + if (pos < 0) /* undefined music */ { - Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename); - free(snd_info); - return NULL; + if (num_music_noconf == 0) /* no fallback music available */ + return NULL; + + pos = UNMAP_NOCONF_MUSIC(pos) % num_music_noconf; + + return Music_NoConf[pos]; } - snd_info->format = AUDIO_FORMAT_U8; + return mus_info[list_pos]; +} -#endif /* PLATFORM_UNIX */ +char *getMusicInfoEntryFilename(int pos) +{ + MusicInfo *mus_info = getMusicInfoEntryFromMusicID(pos); - snd_info->type = SND_TYPE_WAV; - snd_info->source_filename = getStringCopy(filename); + if (mus_info == NULL) + return NULL; - return snd_info; + return getBaseNamePtr(mus_info->source_filename); } -static void deleteSoundEntry(SoundInfo **snd_info) +char *getCurrentlyPlayingMusicFilename() { - if (*snd_info) - { - char *filename = (*snd_info)->source_filename; + return currently_playing_music_filename; +} -#if 0 - printf("[decrementing reference counter of sound '%s']\n", filename); -#endif +int getSoundListPropertyMappingSize() +{ + return sound_info->num_property_mapping_entries; +} - if (--(*snd_info)->num_references <= 0) - { -#if 0 - printf("[deleting sound '%s']\n", filename); -#endif +int getMusicListPropertyMappingSize() +{ + return music_info->num_property_mapping_entries; +} - /* - FreeSound(*snd_info); - */ - deleteNodeFromList(&SoundFileList, filename, FreeSound); - } +struct PropertyMapping *getSoundListPropertyMapping() +{ + return sound_info->property_mapping; +} - *snd_info = NULL; - } +struct PropertyMapping *getMusicListPropertyMapping() +{ + return music_info->property_mapping; } -static void replaceSoundEntry(SoundInfo **snd_info, char *filename) +void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries, + struct ConfigTypeInfo *config_suffix_list, + char **base_prefixes, char **ext1_suffixes, + char **ext2_suffixes, char **ext3_suffixes, + char **ignore_tokens) { - ListNode *node; + int i; - /* check if the old and the new sound file are the same */ - if (*snd_info && strcmp((*snd_info)->source_filename, filename) == 0) - { - /* The old and new sound are the same (have the same filename and path). - This usually means that this sound does not exist in this sound set - and a fallback to the existing sound is done. */ + sound_info = checked_calloc(sizeof(struct ArtworkListInfo)); + sound_info->type = ARTWORK_TYPE_SOUNDS; -#if 0 - printf("[sound '%s' already exists (same list entry)]\n", filename); -#endif + /* ---------- initialize file list and suffix lists ---------- */ - return; - } + sound_info->num_file_list_entries = num_file_list_entries; + sound_info->num_dynamic_file_list_entries = 0; - /* delete existing sound file entry */ - deleteSoundEntry(snd_info); + sound_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + sound_info->dynamic_file_list = NULL; - /* 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 + sound_info->num_suffix_list_entries = 0; + for (i = 0; config_suffix_list[i].token != NULL; i++) + sound_info->num_suffix_list_entries++; - *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); - } -} + sound_info->suffix_list = config_suffix_list; -static void LoadCustomSound(SoundInfo **snd_info, char *basename) -{ - char *filename = getCustomSoundFilename(basename); + /* ---------- initialize base prefix and suffixes lists ---------- */ - if (strcmp(basename, SND_FILE_UNDEFINED) == 0) - { - deleteSoundEntry(snd_info); - return; - } + sound_info->num_base_prefixes = 0; + for (i = 0; base_prefixes[i] != NULL; i++) + sound_info->num_base_prefixes++; - if (filename == NULL) - { - Error(ERR_WARN, "cannot find sound file '%s'", basename); - return; - } + sound_info->num_ext1_suffixes = 0; + for (i = 0; ext1_suffixes[i] != NULL; i++) + sound_info->num_ext1_suffixes++; - replaceSoundEntry(snd_info, filename); -} + sound_info->num_ext2_suffixes = 0; + for (i = 0; ext2_suffixes[i] != NULL; i++) + sound_info->num_ext2_suffixes++; -void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries) -{ - if (Sound == NULL) - Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *)); + sound_info->num_ext3_suffixes = 0; + for (i = 0; ext3_suffixes[i] != NULL; i++) + sound_info->num_ext3_suffixes++; - sound_effect = sounds_list; - num_sounds = num_list_entries; -} + sound_info->num_ignore_tokens = 0; + for (i = 0; ignore_tokens[i] != NULL; i++) + sound_info->num_ignore_tokens++; -void LoadSoundToList(char *basename, int list_pos) -{ - if (Sound == NULL || list_pos >= num_sounds) - return; + sound_info->base_prefixes = base_prefixes; + sound_info->ext1_suffixes = ext1_suffixes; + sound_info->ext2_suffixes = ext2_suffixes; + sound_info->ext3_suffixes = ext3_suffixes; + sound_info->ignore_tokens = ignore_tokens; -#if 0 - printf("loading sound '%s' ... [%d]\n", - basename, getNumNodes(SoundFileList)); -#endif + sound_info->num_property_mapping_entries = 0; - LoadCustomSound(&Sound[list_pos], basename); + sound_info->property_mapping = NULL; -#if 0 - printf("loading sound '%s' done [%d]\n", - basename, getNumNodes(SoundFileList)); -#endif + /* ---------- initialize artwork reference and content lists ---------- */ + + sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *); + + sound_info->artwork_list = + checked_calloc(num_file_list_entries * sizeof(SoundInfo *)); + sound_info->dynamic_artwork_list = NULL; + + sound_info->content_list = NULL; + + /* ---------- initialize artwork loading/freeing functions ---------- */ + + sound_info->load_artwork = Load_WAV; + sound_info->free_artwork = FreeSound; } -static MusicInfo *Load_MOD(char *filename) +void InitMusicList(struct ConfigInfo *config_list, int num_file_list_entries, + struct ConfigTypeInfo *config_suffix_list, + char **base_prefixes, char **ext1_suffixes, + char **ext2_suffixes, char **ext3_suffixes, + char **ignore_tokens) { -#if defined(TARGET_SDL) - MusicInfo *mod_info; + int i; - if (!audio.sound_available) - return NULL; + music_info = checked_calloc(sizeof(struct ArtworkListInfo)); + music_info->type = ARTWORK_TYPE_MUSIC; - mod_info = checked_calloc(sizeof(MusicInfo)); + /* ---------- initialize file list and suffix lists ---------- */ - if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL) - { - Error(ERR_WARN, "cannot read music file '%s'", filename); - free(mod_info); - return NULL; - } + music_info->num_file_list_entries = num_file_list_entries; + music_info->num_dynamic_file_list_entries = 0; - mod_info->type = MUS_TYPE_MOD; - mod_info->source_filename = getStringCopy(filename); + music_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + music_info->dynamic_file_list = NULL; - return mod_info; -#else - return NULL; -#endif -} + music_info->num_suffix_list_entries = 0; + for (i = 0; config_suffix_list[i].token != NULL; i++) + music_info->num_suffix_list_entries++; -void LoadCustomMusic(void) -{ - char *music_directory = getCustomMusicDirectory(); - DIR *dir; - struct dirent *dir_entry; + music_info->suffix_list = config_suffix_list; - if (!audio.sound_available) - return; + /* ---------- initialize base prefix and suffixes lists ---------- */ - if ((dir = opendir(music_directory)) == NULL) - { - Error(ERR_WARN, "cannot read music directory '%s'", music_directory); - audio.music_available = FALSE; - return; - } + music_info->num_base_prefixes = 0; + for (i = 0; base_prefixes[i] != NULL; i++) + music_info->num_base_prefixes++; - while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ - { - char *basename = dir_entry->d_name; - char *filename = getPath2(music_directory, basename); - MusicInfo *mus_info = NULL; + music_info->num_ext1_suffixes = 0; + for (i = 0; ext1_suffixes[i] != NULL; i++) + music_info->num_ext1_suffixes++; - if (FileIsSound(basename)) - mus_info = Load_WAV(filename); - else if (FileIsMusic(basename)) - mus_info = Load_MOD(filename); + music_info->num_ext2_suffixes = 0; + for (i = 0; ext2_suffixes[i] != NULL; i++) + music_info->num_ext2_suffixes++; - free(filename); + music_info->num_ext3_suffixes = 0; + for (i = 0; ext3_suffixes[i] != NULL; i++) + music_info->num_ext3_suffixes++; - if (mus_info) - { - num_music++; - Music = checked_realloc(Music, num_music * sizeof(MusicInfo *)); - Music[num_music -1] = mus_info; - } - } + music_info->num_ignore_tokens = 0; + for (i = 0; ignore_tokens[i] != NULL; i++) + music_info->num_ignore_tokens++; + + music_info->base_prefixes = base_prefixes; + music_info->ext1_suffixes = ext1_suffixes; + music_info->ext2_suffixes = ext2_suffixes; + music_info->ext3_suffixes = ext3_suffixes; + music_info->ignore_tokens = ignore_tokens; + + music_info->num_property_mapping_entries = 0; + + music_info->property_mapping = NULL; + + /* ---------- initialize artwork reference and content lists ---------- */ + + music_info->sizeof_artwork_list_entry = sizeof(MusicInfo *); + + music_info->artwork_list = + checked_calloc(num_file_list_entries * sizeof(MusicInfo *)); + music_info->dynamic_artwork_list = NULL; + + music_info->content_list = NULL; - closedir(dir); + /* ---------- initialize artwork loading/freeing functions ---------- */ - if (num_music == 0) - Error(ERR_WARN, "cannot find any valid music files in directory '%s'", - music_directory); + music_info->load_artwork = Load_WAV_or_MOD; + music_info->free_artwork = FreeMusic; } void PlayMusic(int nr) @@ -1585,105 +922,95 @@ 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 PlayMusicLoop(int nr) +{ + if (!audio.music_available) + return; + + PlaySoundMusicLoop(nr); } void PlaySound(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_SOUND); + if (!setup.sound_simple) + return; + + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_SOUND); } -void PlaySoundStereo(int nr, int stereo) +void PlaySoundStereo(int nr, int stereo_position) { - PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, SND_CTRL_PLAY_SOUND); + if (!setup.sound_simple) + return; + + PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND); } void PlaySoundLoop(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_LOOP); + if (!setup.sound_loops) + return; + + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP); } void PlaySoundMusic(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC); + if (!setup.sound_music) + return; + + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC); +} + +void PlaySoundMusicLoop(int nr) +{ + if (!setup.sound_music) + return; + + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC_LOOP); } -void PlaySoundExt(int nr, int volume, int stereo, int state) +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 || audio.sound_deactivated) return; - if (volume < PSND_MIN_VOLUME) - volume = PSND_MIN_VOLUME; - else if (volume > PSND_MAX_VOLUME) - volume = PSND_MAX_VOLUME; + volume = SETUP_SOUND_VOLUME(volume, state); + + if (volume < SOUND_MIN_VOLUME) + volume = SOUND_MIN_VOLUME; + else if (volume > SOUND_MAX_VOLUME) + volume = SOUND_MAX_VOLUME; - if (stereo < PSND_MAX_LEFT) - stereo = PSND_MAX_LEFT; - else if (stereo > PSND_MAX_RIGHT) - stereo = PSND_MAX_RIGHT; + if (stereo_position < SOUND_MAX_LEFT) + stereo_position = SOUND_MAX_LEFT; + else if (stereo_position > SOUND_MAX_RIGHT) + stereo_position = SOUND_MAX_RIGHT; + + clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */ snd_ctrl.active = TRUE; - snd_ctrl.nr = nr; + snd_ctrl.nr = nr; snd_ctrl.volume = volume; - snd_ctrl.stereo = stereo; - snd_ctrl.state = state; - -#if defined(TARGET_SDL) - if (Sound[nr]) - { - Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_PlayChannel(-1, Sound[nr]->data_ptr, (state & SND_CTRL_LOOP ? -1 : 0)); - } -#elif defined(PLATFORM_UNIX) - if (audio.soundserver_pid == 0) /* we are child process */ - return; + 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, SND_CTRL_FADE_MUSIC); -#endif } void FadeSound(int nr) @@ -1693,21 +1020,21 @@ void FadeSound(int nr) void FadeSounds() { - FadeMusic(); StopSoundExt(-1, SND_CTRL_FADE_ALL); } +void FadeSoundsAndMusic() +{ + FadeSounds(); + FadeMusic(); +} + 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, SND_CTRL_STOP_MUSIC); -#endif } void StopSound(int nr) @@ -1723,277 +1050,64 @@ void StopSounds() void StopSoundExt(int nr, int state) { - struct SoundControl snd_ctrl = emptySoundControl; + SoundControl snd_ctrl; if (!audio.sound_available) return; - snd_ctrl.nr = nr; - snd_ctrl.state = state; - -#if defined(TARGET_SDL) - - if (state & SND_CTRL_FADE) - { - int i; - - for (i=0; ikey = 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 0 - printf("[CHECKING LIST KEY '%s' == '%s']\n", - (*node_first)->key, key); -#endif - - if (strcmp((*node_first)->key, key) == 0) - { -#if 0 - printf("[DELETING LIST ENTRY]\n"); -#endif - - free((*node_first)->key); - if (destructor_function) - destructor_function((*node_first)->content); - *node_first = (*node_first)->next; - } - else - deleteNodeFromList(&(*node_first)->next, key, destructor_function); -} - -ListNode *getNodeFromKey(ListNode *node_first, char *key) -{ - if (node_first == NULL) - return NULL; - - if (strcmp(node_first->key, 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; + clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */ - while (node) - { - printf("['%s' (%d)]\n", node->key, - ((SoundInfo *)node->content)->num_references); - node = node->next; - } + snd_ctrl.active = FALSE; + snd_ctrl.nr = nr; + snd_ctrl.state = state; - printf("[%d nodes]\n", getNumNodes(node_first)); + HandleSoundRequest(snd_ctrl); } -static void LoadSoundsInfo() +void ExpireSoundLoops(boolean active) { - char *filename = getCustomSoundConfigFilename(); - struct SetupFileList *setup_file_list; - int i; + SoundControl snd_ctrl; - /* 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 - } + HandleSoundRequest(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; ifullpath) + 1; - unsigned long str_size2 = strlen(ti->basepath) + 1; - unsigned long str_size3 = strlen(ti->fullpath) + 1; -#endif -#endif - if (!audio.sound_available) return; -#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO) - if (type == SND_CTRL_RELOAD_SOUNDS) - ReloadCustomSounds(); - else - ReloadCustomMusic(); -#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"); - -#if 1 - WriteReloadInfoToPipe(set_name, type); -#else - - snd_ctrl.state = type; - snd_ctrl.data_len = strlen(set_name) + 1; - - if (write(audio.soundserver_pipe[1], &snd_ctrl, - sizeof(snd_ctrl)) < 0 || - write(audio.soundserver_pipe[1], set_name, - snd_ctrl.data_len) < 0 || - write(audio.soundserver_pipe[1], leveldir_current, - sizeof(TreeInfo)) < 0 || - write(audio.soundserver_pipe[1], ti, - sizeof(TreeInfo)) < 0 || - write(audio.soundserver_pipe[1], &str_size1, - sizeof(unsigned long)) < 0 || - write(audio.soundserver_pipe[1], &str_size2, - sizeof(unsigned long)) < 0 || - write(audio.soundserver_pipe[1], &str_size3, - sizeof(unsigned long)) < 0 || - write(audio.soundserver_pipe[1], leveldir_current->fullpath, - str_size1) < 0 || - write(audio.soundserver_pipe[1], ti->basepath, - str_size2) < 0 || - write(audio.soundserver_pipe[1], ti->fullpath, - str_size3) < 0) - { - Error(ERR_WARN, "cannot pipe to child process -- no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; - return; - } -#endif - -#endif + ReloadCustomSounds(); } -void InitReloadSounds(char *set_name) +void InitReloadCustomMusic(char *set_identifier) { - InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_SOUNDS); -} + if (!audio.music_available) + return; -void InitReloadMusic(char *set_name) -{ - InitReloadSoundsOrMusic(set_name, SND_CTRL_RELOAD_MUSIC); + ReloadCustomMusic(); } void FreeSound(void *ptr) @@ -2005,82 +1119,57 @@ void FreeSound(void *ptr) if (sound->data_ptr) { -#if defined(TARGET_SDL) Mix_FreeChunk(sound->data_ptr); -#elif defined(TARGET_ALLEGRO) - destroy_sample(sound->data_ptr); -#else /* PLATFORM_UNIX */ - free(sound->data_ptr); -#endif } - if (sound->source_filename) - free(sound->source_filename); + checked_free(sound->source_filename); free(sound); } -void FreeMusic(MusicInfo *music) +void FreeMusic(void *ptr) { + MusicInfo *music = (MusicInfo *)ptr; + 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 /* PLATFORM_UNIX */ - free(music->data_ptr); -#endif } free(music); } -void FreeAllSounds() +static void FreeAllMusic_NoConf() { int i; - if (Sound == NULL) + if (Music_NoConf == NULL) return; - printf("%s: FREEING SOUNDS ...\n", - audio.soundserver_pid == 0 ? "CHILD" : "PARENT"); + for (i = 0; i < num_music_noconf; i++) + FreeMusic(Music_NoConf[i]); - for(i=0; i