X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=60b8bc306cdc95f403c12cb03512863af16303dd;hb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;hp=1cf7e5f1baeaa86cce0188ce2676d73132c0d28e;hpb=3d07b68a314ce189f207e42d95f786979662410d;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 1cf7e5f1..4f5ddd0b 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,1047 +1,1181 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * -*----------------------------------------------------------* -* sound.c * -***********************************************************/ - +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// https://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" + + +// expiration time (in milliseconds) for sound loops +#define SOUND_LOOP_EXPIRATION_TIME 200 + +// one second fading interval == 1000 ticks (milliseconds) +#define SOUND_FADING_INTERVAL 1000 + +#define SND_TYPE_NONE 0 +#define SND_TYPE_WAV 1 + +#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" +#define SOUND_VOLUME_LEFT(x) (stereo_volume[x]) +#define SOUND_VOLUME_RIGHT(x) (stereo_volume[SOUND_MAX_LEFT2RIGHT-x]) -static int num_sounds = 0; -static struct SampleInfo *Sound = NULL; +#define SAME_SOUND_NR(x,y) ((x).nr == (y).nr) +#define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr) +#define SOUND_VOLUME_FROM_PERCENT(v,p) ((p) < 0 ? SOUND_MIN_VOLUME : \ + (p) > 100 ? (v) : \ + (p) * (v) / 100) -/*** THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/ +#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) -static int playing_sounds = 0; -static struct SoundControl playlist[MAX_SOUNDS_PLAYING]; -static struct SoundControl emptySoundControl = +#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)) + +struct AudioFormatInfo { - -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL + 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 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 +struct SampleInfo +{ + char *source_filename; + int num_references; + + 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; -/* forward declaration of internal functions */ -#if defined(AUDIO_STREAMING_DSP) -static void SoundServer_InsertNewSound(struct SoundControl); -#elif defined(PLATFORM_UNIX) -static unsigned char linear_to_ulaw(int); -static int ulaw_to_linear(unsigned char); -#endif +struct SoundControl +{ + boolean active; -#if defined(PLATFORM_HPUX) -static void HPUX_Audio_Control(); -#endif + int nr; + int volume; + int stereo_position; -#if defined(PLATFORM_MSDOS) -static void SoundServer_InsertNewSound(struct SoundControl); -static void SoundServer_StopSound(int); -static void SoundServer_StopAllSounds(); -#endif + int state; + + unsigned int playing_starttime; + unsigned int playing_pos; + + 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 struct ArtworkListInfo *sound_info = NULL; +static struct ArtworkListInfo *music_info = NULL; + +static MusicInfo **Music_NoConf = NULL; + +static int num_music_noconf = 0; +static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; + +static char *currently_playing_music_filename = NULL; + + +// ============================================================================ +// THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS -#if defined(PLATFORM_UNIX) -int OpenAudioDevice(char *audio_device_name) +static struct SoundControl mixer[NUM_MIXER_CHANNELS]; +static int mixer_active_channels = 0; +static boolean expire_loop_sounds = FALSE; + +static void ReloadCustomSounds(void); +static void ReloadCustomMusic(void); +static void FreeSound(void *); +static void FreeMusic(void *); +static void FreeAllMusic_NoConf(void); +static void Mixer_StopMusicChannel(void); + +static SoundInfo *getSoundInfoEntryFromSoundID(int); +static MusicInfo *getMusicInfoEntryFromMusicID(int); + + +// ---------------------------------------------------------------------------- +// mixer functions +// ---------------------------------------------------------------------------- + +void Mixer_InitChannels(void) +{ + int i; + + for (i = 0; i < audio.num_channels; i++) + mixer[i].active = FALSE; + mixer_active_channels = 0; +} + +static void Mixer_ResetChannelExpiration(int channel) +{ + mixer[channel].playing_starttime = Counter(); + + if (expire_loop_sounds && + IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel])) + Mix_ExpireChannel(channel, SOUND_LOOP_EXPIRATION_TIME); +} + +static boolean Mixer_ChannelExpired(int channel) { - int audio_fd; + if (!mixer[channel].active) + return TRUE; - /* check if desired audio device is accessible */ - if (access(audio_device_name, W_OK) != 0) - return -1; + if (expire_loop_sounds && + IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) && + DelayReached(&mixer[channel].playing_starttime, + SOUND_LOOP_EXPIRATION_TIME)) + return TRUE; - /* 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 (!Mix_Playing(channel)) + return TRUE; - /* re-open audio device in blocking mode */ - close(audio_fd); - audio_fd = open(audio_device_name, O_WRONLY); + return FALSE; +} - return audio_fd; +static boolean Mixer_AllocateChannel(int channel) +{ + return TRUE; } -void UnixOpenAudio(struct AudioSystemInfo *audio) +static void Mixer_SetChannelProperties(int channel) { - static char *audio_device_name[] = - { - DEVICENAME_DSP, - DEVICENAME_AUDIO - }; - int audio_fd = -1; - int i; + Mix_Volume(channel, mixer[channel].volume); + Mix_SetPanning(channel, + SOUND_VOLUME_LEFT(mixer[channel].stereo_position), + SOUND_VOLUME_RIGHT(mixer[channel].stereo_position)); +} - /* look for available audio devices, starting with preferred ones */ - for (i=0; i= 0) - break; +static void Mixer_StartChannel(int channel) +{ + Mix_PlayChannel(channel, mixer[channel].data_ptr, + IS_LOOP(mixer[channel]) ? -1 : 0); +} - if (audio_fd < 0) - { - Error(ERR_WARN, "cannot open audio device - no sound"); +static void Mixer_PlayChannel(int channel) +{ + // start with inactive channel in case something goes wrong + mixer[channel].active = FALSE; + + if (mixer[channel].type != MUS_TYPE_WAV) return; - } - close(audio_fd); + if (!Mixer_AllocateChannel(channel)) + return; - audio->device_name = audio_device_name[i]; - audio->sound_available = TRUE; - audio->sound_enabled = TRUE; + Mixer_SetChannelProperties(channel); + Mixer_StartChannel(channel); + + Mixer_ResetChannelExpiration(channel); + + mixer[channel].playing_pos = 0; + mixer[channel].active = TRUE; + mixer_active_channels++; +} -#if defined(AUDIO_STREAMING_DSP) - audio->loops_available = TRUE; +static void Mixer_PlayMusicChannel(void) +{ + Mixer_PlayChannel(audio.music_channel); + + if (mixer[audio.music_channel].type != MUS_TYPE_WAV) + { + int loops = (IS_LOOP(mixer[audio.music_channel]) ? -1 : 1); + + // stopping music channel before playing next track seems to be needed to + // prevent audio problems that may occur when playing MP3 files on Windows + Mixer_StopMusicChannel(); + + // use short fade-in to prevent "plop" sound for certain music files + // (this may happen when switching on music while playing the game) + Mix_VolumeMusic(mixer[audio.music_channel].volume); + Mix_FadeInMusic(mixer[audio.music_channel].data_ptr, loops, 100); + +#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: always play MIDI music with maximum volume + if (Mix_GetMusicType(NULL) == MUS_MID) + Mix_VolumeMusic(SOUND_MAX_VOLUME); #endif + } } -void UnixCloseAudio(struct AudioSystemInfo *audio) +static void Mixer_StopChannel(int channel) { - if (audio->device_fd) - close(audio->device_fd); + if (!mixer[channel].active) + return; + + Mix_HaltChannel(channel); + + mixer[channel].active = FALSE; + mixer_active_channels--; } -#endif /* PLATFORM_UNIX */ +static void Mixer_StopMusicChannel(void) +{ + Mixer_StopChannel(audio.music_channel); + + Mix_HaltMusic(); -void SoundServer() + setString(¤tly_playing_music_filename, NULL); +} + +static void Mixer_FadeChannel(int channel) { - int i; -#if defined(PLATFORM_UNIX) - struct SoundControl snd_ctrl; - fd_set sound_fdset; + if (!mixer[channel].active) + return; + + mixer[channel].state |= SND_CTRL_FADE; + + Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL); +} - close(audio.soundserver_pipe[1]); /* no writing into pipe needed */ +static void Mixer_FadeMusicChannel(void) +{ + Mixer_FadeChannel(audio.music_channel); + + Mix_FadeOutMusic(SOUND_FADING_INTERVAL); + +#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 - for(i=0;itype; + 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; - for(i=0;isource_filename)); - if (!playing_sounds) - close(audio.device_fd); - } + return; + } - 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 = 0; - /* Even if the stereo flag is used as being boolean, it must be - defined as an integer, else 'ioctl()' will fail! */ - int stereo = TRUE; -#if 0 - int sample_rate = 8000; -#else - int sample_rate = 22050; -#endif + // check if (and how often) this sound sample is already playing + for (k = 0, i = audio.first_sound_channel; i < audio.num_channels; i++) + if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl)) + k++; - if (playing_sounds || - (audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0) + // reset expiration delay for already playing loop sounds + if (k > 0 && IS_LOOP(snd_ctrl)) + { + for (i = audio.first_sound_channel; i < audio.num_channels; i++) + { + if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl)) { - if (!playing_sounds) /* we just opened the audio device */ - { - /* 2 buffers / 512 bytes, giving 1/16 second resolution */ - /* (with stereo the effective buffer size will shrink to 256) */ - fragment_size = 0x00020009; - - if (ioctl(audio.device_fd,SNDCTL_DSP_SETFRAGMENT,&fragment_size) < 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=PSND_MAX_VOLUME/10) - playlist[i].volume-=PSND_MAX_VOLUME/20; - - /* 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 <= PSND_MAX_VOLUME/10) - { - 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); + if (IS_FADING(mixer[i])) + Mixer_UnFadeChannel(i); + + // restore settings like volume and stereo position + mixer[i].volume = snd_ctrl.volume; + mixer[i].stereo_position = snd_ctrl.stereo_position; + + Mixer_SetChannelProperties(i); + Mixer_ResetChannelExpiration(i); } } -#else /* !AUDIO_STREAMING_DSP */ + return; + } + + // don't play sound more than n times simultaneously (with n == 2 for now) + if (k >= 2) + { + unsigned int playing_current = Counter(); + int longest = 0, longest_nr = audio.first_sound_channel; - if (snd_ctrl.active && !snd_ctrl.loop) + // look for oldest equal sound + for (i = audio.first_sound_channel; i < audio.num_channels; i++) { - struct timeval delay = { 0, 0 }; - byte *sample_ptr; - long sample_size, max_sample_size = SND_BLOCKSIZE; - long sample_rate = 8000; /* standard "/dev/audio" sampling rate */ - int wait_percent = 90; /* wait 90% of the real playing time */ - int i; - - if ((audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0) - { - playing_sounds = 1; + int playing_time = playing_current - mixer[i].playing_starttime; + int actual; - while(playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); + if (!mixer[i].active || !SAME_SOUND_NR(mixer[i], snd_ctrl)) + continue; - /* get pointer and size of the actual sound sample */ - sample_ptr = snd_ctrl.data_ptr + snd_ctrl.playingpos; - sample_size = - MIN(max_sample_size, snd_ctrl.data_len - snd_ctrl.playingpos); - snd_ctrl.playingpos += sample_size; + actual = 1000 * playing_time / mixer[i].data_len; - /* fill the first mixing buffer with original sample */ - memcpy(premix_first_buffer,sample_ptr,sample_size); + if (actual >= longest) + { + longest = actual; + longest_nr = i; + } + } + Mixer_StopChannel(longest_nr); + } - /* adjust volume of actual sound sample */ - if (snd_ctrl.volume != PSND_MAX_VOLUME) - for(i=0;i> PSND_MAX_VOLUME_BITS; + /* 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. */ - for(i=0;i= snd_ctrl.data_len) - playing_sounds = 0; + mixer_active_channels--; + } + } + } +#endif - /* finally play the sound fragment */ - write(audio.device_fd,playing_buffer,sample_size); + 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; + + 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; - delay.tv_sec = 0; - delay.tv_usec = ((sample_size*10*wait_percent)/(sample_rate))*1000; - } - close(audio.device_fd); + if (!IS_LOOP(mixer[i]) && actual > longest) + { + longest = actual; + longest_nr = i; } } -#endif /* !AUDIO_STREAMING_DSP */ - + Mixer_StopChannel(longest_nr); } -#endif /* PLATFORM_UNIX */ + // 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); + break; + } + } } -#if defined(PLATFORM_MSDOS) -static void sound_handler(struct SoundControl snd_ctrl) +static void HandleSoundRequest(SoundControl snd_ctrl) { int i; - if (snd_ctrl.fade_sound) + // deactivate channels that have expired since the last request + for (i = 0; i < audio.num_channels; i++) + if (mixer[i].active && Mixer_ChannelExpired(i)) + Mixer_StopChannel(i); + + if (IS_RELOADING(snd_ctrl)) // load new sound or music files + { + Mixer_StopMusicChannel(); + for (i = audio.first_sound_channel; i < audio.num_channels; i++) + Mixer_StopChannel(i); + + 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) + if (IS_MUSIC(snd_ctrl)) + { + Mixer_FadeMusicChannel(); 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); -#endif - playlist[longest_nr] = emptySoundControl; - playing_sounds--; + if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL) + { + Error(ERR_WARN, "cannot read sound file '%s': %s", filename, Mix_GetError()); + free(snd_info); + return NULL; } - /* check if sound is already being played (and how often) */ - for(k=0,i=0;idata_len = ((Mix_Chunk *)snd_info->data_ptr)->alen; + + snd_info->type = SND_TYPE_WAV; + snd_info->source_filename = getStringCopy(filename); + + return snd_info; +} + +static void *Load_MOD(char *filename) +{ + MusicInfo *mod_info; + + if (!audio.sound_available) + return NULL; + + mod_info = checked_calloc(sizeof(MusicInfo)); + + if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL) { - if (playlist[i].nr == snd_ctrl.nr) - k++; + Error(ERR_WARN, "cannot read music file '%s': %s", filename, Mix_GetError()); + free(mod_info); + return NULL; } - /* restart loop sounds only if they are just fading out */ - if (k>=1 && snd_ctrl.loop) + mod_info->type = MUS_TYPE_MOD; + mod_info->source_filename = getStringCopy(filename); + + return mod_info; +} + +static void *Load_WAV_or_MOD(char *filename) +{ + if (FileIsMusic(filename)) + return Load_MOD(filename); + else if (FileIsSound(filename)) + return Load_WAV(filename); + else + return NULL; +} + +static 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 (!audio.sound_available) + return; + + if (last_music_directory != NULL && + strEqual(last_music_directory, music_directory)) + return; // old and new music directory are the same + + if (last_music_directory != NULL) + free(last_music_directory); + last_music_directory = getStringCopy(music_directory); + + FreeAllMusic_NoConf(); + + if ((dir = openDirectory(music_directory)) == NULL) { - for(i=0;i=2) + if (draw_init_text) + DrawInitText("Loading music", 120, FC_GREEN); + + while ((dir_entry = readDirectory(dir)) != NULL) // loop all entries { - int longest=0, longest_nr=0; + char *basename = dir_entry->basename; + MusicInfo *mus_info = NULL; + boolean music_already_used = FALSE; + int i; - /* look for oldest equal sound */ - for(i=0;i=longest) + if (strEqual(basename, music->filename)) { - longest=actual; - longest_nr=i; + music_already_used = TRUE; + break; } } -#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--; - } + if (music_already_used) + continue; - /* neuen Sound in Liste packen */ - for(i=0;ifilename)) + mus_info = Load_WAV_or_MOD(dir_entry->filename); + + if (mus_info) { - playlist[i] = snd_ctrl; - playing_sounds++; - -#if defined(PLATFORM_MSDOS) - playlist[i].voice = allocate_voice(Sound[snd_ctrl.nr].sample_ptr); - if(snd_ctrl.loop) - voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP); - voice_set_volume(playlist[i].voice, snd_ctrl.volume); - voice_set_pan(playlist[i].voice, snd_ctrl.stereo); - voice_start(playlist[i].voice); -#endif - break; + num_music_noconf++; + Music_NoConf = checked_realloc(Music_NoConf, + num_music_noconf * sizeof(MusicInfo *)); + Music_NoConf[num_music_noconf - 1] = mus_info; } } + + closeDirectory(dir); + + draw_init_text = FALSE; } -#endif /* !PLATFORM_WIN32 */ -/* -void SoundServer_FadeSound(int nr) +int getSoundListSize(void) { - int i; - - if (!playing_sounds) - return; + return (sound_info->num_file_list_entries + + sound_info->num_dynamic_file_list_entries); +} - for(i=0;inum_file_list_entries + + music_info->num_dynamic_file_list_entries); } -*/ -#if !defined(PLATFORM_WIN32) -#if defined(PLATFORM_MSDOS) -static void SoundServer_StopSound(int nr) +struct FileInfo *getSoundListEntry(int pos) { - int i; + 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 (!playing_sounds) - return; + if (pos < 0 || pos >= num_sounds) // invalid sound + return NULL; - for(i=0;ifile_list[list_pos] : + &sound_info->dynamic_file_list[list_pos]); +} -#if !defined(PLATFORM_MSDOS) - if (!playing_sounds) - close(audio.device_fd); -#endif +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; + + return (pos < num_list_entries ? &music_info->file_list[list_pos] : + &music_info->dynamic_file_list[list_pos]); } -static void SoundServer_StopAllSounds() +static SoundInfo *getSoundInfoEntryFromSoundID(int pos) { - int i; + 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); - for(i=0;i= num_sounds) // invalid sound + return NULL; -#if !defined(PLATFORM_MSDOS) - close(audio.device_fd); -#endif + return snd_info[list_pos]; } -#endif /* PLATFORM_MSDOS */ -#endif /* !PLATFORM_WIN32 */ -#if defined(PLATFORM_HPUX) -static void HPUX_Audio_Control() +static MusicInfo *getMusicInfoEntryFromMusicID(int pos) { - struct audio_describe ainfo; - int audio_ctl; + 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); - 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 (pos >= num_music) // invalid music + return NULL; - if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - Error(ERR_EXIT_SOUND_SERVER, "no audio info - no sounds"); + if (pos < 0) // undefined music + { + if (num_music_noconf == 0) // no fallback music available + return NULL; - if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) - Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available - no sounds"); + pos = UNMAP_NOCONF_MUSIC(pos) % num_music_noconf; - ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); - ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); + return Music_NoConf[pos]; + } - close(audio_ctl); + return mus_info[list_pos]; } -#endif /* PLATFORM_HPUX */ - -#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) + +char *getMusicInfoEntryFilename(int pos) { - static int exp_lut[256] = - { - 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 + MusicInfo *mus_info = getMusicInfoEntryFromMusicID(pos); - return(ulawbyte); + if (mus_info == NULL) + return NULL; + + return getBaseNamePtr(mus_info->source_filename); } -/* -** 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) +char *getCurrentlyPlayingMusicFilename(void) { - 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); + return currently_playing_music_filename; } -#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */ -/*** THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/ +int getSoundListPropertyMappingSize(void) +{ + return sound_info->num_property_mapping_entries; +} -/*===========================================================================*/ +int getMusicListPropertyMappingSize(void) +{ + return music_info->num_property_mapping_entries; +} -/*** THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS ***/ +struct PropertyMapping *getSoundListPropertyMapping(void) +{ + return sound_info->property_mapping; +} -void AllocSoundArray(int num) +struct PropertyMapping *getMusicListPropertyMapping(void) { - num_sounds = num; - Sound = checked_calloc(num_sounds * sizeof(struct SampleInfo)); + return music_info->property_mapping; } -#define CHUNK_ID_LEN 4 /* IFF style chunk id length */ -#define WAV_HEADER_SIZE 20 /* size of WAV file header */ +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) +{ + int i; + + sound_info = checked_calloc(sizeof(struct ArtworkListInfo)); + sound_info->type = ARTWORK_TYPE_SOUNDS; + + // ---------- initialize file list and suffix lists ---------- + + sound_info->num_file_list_entries = num_file_list_entries; + sound_info->num_dynamic_file_list_entries = 0; + + sound_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + sound_info->dynamic_file_list = NULL; + + sound_info->num_suffix_list_entries = 0; + for (i = 0; config_suffix_list[i].token != NULL; i++) + sound_info->num_suffix_list_entries++; + + sound_info->suffix_list = config_suffix_list; + + // ---------- initialize base prefix and suffixes lists ---------- + + sound_info->num_base_prefixes = 0; + for (i = 0; base_prefixes[i] != NULL; i++) + sound_info->num_base_prefixes++; + + sound_info->num_ext1_suffixes = 0; + for (i = 0; ext1_suffixes[i] != NULL; i++) + sound_info->num_ext1_suffixes++; + + sound_info->num_ext2_suffixes = 0; + for (i = 0; ext2_suffixes[i] != NULL; i++) + sound_info->num_ext2_suffixes++; + + sound_info->num_ext3_suffixes = 0; + for (i = 0; ext3_suffixes[i] != NULL; i++) + sound_info->num_ext3_suffixes++; + + sound_info->num_ignore_tokens = 0; + for (i = 0; ignore_tokens[i] != NULL; i++) + sound_info->num_ignore_tokens++; + + 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; + + sound_info->num_property_mapping_entries = 0; + + sound_info->property_mapping = NULL; + + // ---------- 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; -boolean LoadSound(int sound_nr, char *sound_name) + // ---------- initialize artwork loading/freeing functions ---------- + + sound_info->load_artwork = Load_WAV; + sound_info->free_artwork = FreeSound; +} + +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) { - struct SampleInfo *snd_info = &Sound[sound_nr]; - char filename[256]; - char *sound_ext = "wav"; -#if !defined(TARGET_SDL) -#if !defined(PLATFORM_MSDOS) - byte sound_header_buffer[WAV_HEADER_SIZE]; - char chunk[CHUNK_ID_LEN + 1]; - int chunk_length, dummy; - FILE *file; int i; -#endif -#endif - snd_info->name = sound_name; + music_info = checked_calloc(sizeof(struct ArtworkListInfo)); + music_info->type = ARTWORK_TYPE_MUSIC; - sprintf(filename, "%s/%s/%s.%s", - options.ro_base_directory, SOUNDS_DIRECTORY, - snd_info->name, sound_ext); + // ---------- initialize file list and suffix lists ---------- -#if defined(TARGET_SDL) + music_info->num_file_list_entries = num_file_list_entries; + music_info->num_dynamic_file_list_entries = 0; - snd_info->mix_chunk = Mix_LoadWAV(filename); - if (snd_info->mix_chunk == NULL) - { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); - return FALSE; - } + music_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + music_info->dynamic_file_list = NULL; -#else /* !TARGET_SDL */ + music_info->num_suffix_list_entries = 0; + for (i = 0; config_suffix_list[i].token != NULL; i++) + music_info->num_suffix_list_entries++; -#if !defined(PLATFORM_MSDOS) + music_info->suffix_list = config_suffix_list; - if ((file = fopen(filename, "r")) == NULL) - { - Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename); - return FALSE; - } + // ---------- initialize base prefix and suffixes lists ---------- - /* read chunk "RIFF" */ - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk, "RIFF") != 0) - { - Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); - fclose(file); - return FALSE; - } + music_info->num_base_prefixes = 0; + for (i = 0; base_prefixes[i] != NULL; i++) + music_info->num_base_prefixes++; - /* read chunk "WAVE" */ - getFileChunk(file, chunk, &dummy, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk, "WAVE") != 0) - { - Error(ERR_WARN, "missing 'WAVE' chunk of sound file '%s'", filename); - fclose(file); - return FALSE; - } + music_info->num_ext1_suffixes = 0; + for (i = 0; ext1_suffixes[i] != NULL; i++) + music_info->num_ext1_suffixes++; - /* read header information */ - for (i=0; inum_ext2_suffixes = 0; + for (i = 0; ext2_suffixes[i] != NULL; i++) + music_info->num_ext2_suffixes++; - /* read chunk "data" */ - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk, "data") != 0) - { - Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename); - fclose(file); - return FALSE; - } + music_info->num_ext3_suffixes = 0; + for (i = 0; ext3_suffixes[i] != NULL; i++) + music_info->num_ext3_suffixes++; - snd_info->data_len = chunk_length; - snd_info->data_ptr = checked_malloc(snd_info->data_len); + music_info->num_ignore_tokens = 0; + for (i = 0; ignore_tokens[i] != NULL; i++) + music_info->num_ignore_tokens++; - /* read sound data */ - if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) != - snd_info->data_len) - { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); - fclose(file); - return FALSE; - } + 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; - fclose(file); + music_info->num_property_mapping_entries = 0; - for (i=0; idata_len; i++) - snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80; + music_info->property_mapping = NULL; -#else /* PLATFORM_MSDOS */ + // ---------- initialize artwork reference and content lists ---------- - snd_info->sample_ptr = load_sample(filename); - if (!snd_info->sample_ptr) - { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); - return FALSE; - } + music_info->sizeof_artwork_list_entry = sizeof(MusicInfo *); -#endif /* PLATFORM_MSDOS */ -#endif /* !TARGET_SDL */ + music_info->artwork_list = + checked_calloc(num_file_list_entries * sizeof(MusicInfo *)); + music_info->dynamic_artwork_list = NULL; - return TRUE; + music_info->content_list = NULL; + + // ---------- initialize artwork loading/freeing functions ---------- + + music_info->load_artwork = Load_WAV_or_MOD; + music_info->free_artwork = FreeMusic; +} + +void PlayMusic(int nr) +{ + if (!audio.music_available) + return; + + PlaySoundMusic(nr); +} + +void PlayMusicLoop(int nr) +{ + if (!audio.music_available) + return; + + PlaySoundMusicLoop(nr); } void PlaySound(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_NO_LOOP); + 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, PSND_NO_LOOP); + 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, PSND_LOOP); + if (!setup.sound_loops) + return; + + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP); } -void PlaySoundExt(int nr, int volume, int stereo, boolean loop) +void PlaySoundMusic(int nr) { - struct SoundControl snd_ctrl = emptySoundControl; + if (!setup.sound_music) + return; + + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC); +} - if (!audio.sound_available || !audio.sound_enabled) +void PlaySoundMusicLoop(int nr) +{ + if (!setup.sound_music) return; - if (volumePSND_MAX_VOLUME) - volume = PSND_MAX_VOLUME; + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC_LOOP); +} + +void PlaySoundExt(int nr, int volume, int stereo_position, int state) +{ + SoundControl snd_ctrl; + + if (!audio.sound_available || + !audio.sound_enabled || + audio.sound_deactivated) + return; - if (stereoPSND_MAX_RIGHT) - stereo = PSND_MAX_RIGHT; + volume = SETUP_SOUND_VOLUME(volume, state); - 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; + if (volume < SOUND_MIN_VOLUME) + volume = SOUND_MIN_VOLUME; + else if (volume > SOUND_MAX_VOLUME) + volume = SOUND_MAX_VOLUME; -#if defined(TARGET_SDL) + if (stereo_position < SOUND_MAX_LEFT) + stereo_position = SOUND_MAX_LEFT; + else if (stereo_position > SOUND_MAX_RIGHT) + stereo_position = SOUND_MAX_RIGHT; - Mix_Volume(-1, SDL_MIX_MAXVOLUME / 4); - Mix_VolumeMusic(SDL_MIX_MAXVOLUME / 4); + clear_mem(&snd_ctrl, sizeof(SoundControl)); // to make valgrind happy - Mix_PlayChannel(-1, Sound[nr].mix_chunk, (loop ? -1 : 0)); + snd_ctrl.active = TRUE; + snd_ctrl.nr = nr; + snd_ctrl.volume = volume; + snd_ctrl.stereo_position = stereo_position; + snd_ctrl.state = state; -#else -#if !defined(PLATFORM_MSDOS) - 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; + HandleSoundRequest(snd_ctrl); +} + +void FadeMusic(void) +{ + if (!audio.music_available) return; - } -#else - sound_handler(snd_ctrl); -#endif -#endif + + StopSoundExt(-1, SND_CTRL_FADE_MUSIC); } void FadeSound(int nr) { - StopSoundExt(nr, SSND_FADE_SOUND); + StopSoundExt(nr, SND_CTRL_FADE_SOUND); +} + +void FadeSounds(void) +{ + StopSoundExt(-1, SND_CTRL_FADE_ALL); +} + +void FadeSoundsAndMusic(void) +{ + FadeSounds(); + FadeMusic(); } -void FadeSounds() +void StopMusic(void) { - StopSoundExt(-1, SSND_FADE_ALL_SOUNDS); + 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() +void StopSounds(void) { - 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; + clear_mem(&snd_ctrl, sizeof(SoundControl)); // to make valgrind happy - if (SSND_ALL(method)) - snd_ctrl.stop_all_sounds = TRUE; - else - { - snd_ctrl.nr = nr; - snd_ctrl.stop_sound = TRUE; - } + snd_ctrl.active = FALSE; + snd_ctrl.nr = nr; + snd_ctrl.state = state; + + HandleSoundRequest(snd_ctrl); +} -#if defined(TARGET_SDL) +void ExpireSoundLoops(boolean active) +{ + SoundControl snd_ctrl; - if (SSND_FADING(method)) - { - Mix_FadeOutChannel(-1, 1000); - Mix_FadeOutMusic(1000); - } - else + if (!audio.sound_available) + return; + + clear_mem(&snd_ctrl, sizeof(SoundControl)); // to make valgrind happy + + snd_ctrl.active = active; + snd_ctrl.state = SND_CTRL_EXPIRE_LOOPS; + + HandleSoundRequest(snd_ctrl); +} + +static void ReloadCustomSounds(void) +{ + LoadArtworkConfig(sound_info); + ReloadCustomArtworkList(sound_info); +} + +static void ReloadCustomMusic(void) +{ + LoadArtworkConfig(music_info); + ReloadCustomArtworkList(music_info); + + // load all music files from directory not defined in "musicinfo.conf" + LoadCustomMusic_NoConf(); +} + +void InitReloadCustomSounds(char *set_identifier) +{ + if (!audio.sound_available) + return; + + ReloadCustomSounds(); +} + +void InitReloadCustomMusic(char *set_identifier) +{ + if (!audio.music_available) + return; + + ReloadCustomMusic(); +} + +void FreeSound(void *ptr) +{ + SoundInfo *sound = (SoundInfo *)ptr; + + if (sound == NULL) + return; + + if (sound->data_ptr) { - Mix_HaltChannel(-1); - Mix_HaltMusic(); + Mix_FreeChunk(sound->data_ptr); } -#else -#if !defined(PLATFORM_MSDOS) - 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; + checked_free(sound->source_filename); + + free(sound); +} + +void FreeMusic(void *ptr) +{ + MusicInfo *music = (MusicInfo *)ptr; + + if (music == NULL) return; + + if (music->data_ptr) + { + if (music->type == MUS_TYPE_MOD) + Mix_FreeMusic(music->data_ptr); + else + Mix_FreeChunk(music->data_ptr); } -#else - sound_handler(snd_ctrl); -#endif -#endif + + free(music); } -void FreeSounds(int num_sounds) +static void FreeAllMusic_NoConf(void) { int i; - if (!audio.sound_available) + if (Music_NoConf == NULL) return; - for(i=0; i