X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=57e61c7093f37c939a99e29f614c78dad6de4f59;hp=faa9a49d598344a6e8da3cf99f35e93c2136235d;hb=8d71e6fb8309bd90ce5f2900d84c686b17950492;hpb=8932f698c0831ab0e4ae2e03d64a48be1aeee82a diff --git a/src/libgame/sound.c b/src/libgame/sound.c index faa9a49d..cb788e7e 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,1114 +1,883 @@ -/*********************************************************** -* 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" -static int num_sounds = 0, num_music = 0; -static struct SampleInfo *Sound = NULL; -#if defined(TARGET_SDL) -static int num_mods = 0; -static struct SampleInfo *Mod = NULL; -#endif +/* 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 -/* ========================================================================= */ -/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ +#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]) + +#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) + +#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) + +#define SETUP_SOUND_VOLUME(v,s) ((s) == SND_CTRL_PLAY_MUSIC ? \ + SOUND_VOLUME_MUSIC(v) : \ + (s) == SND_CTRL_PLAY_LOOP ? \ + SOUND_VOLUME_LOOPS(v) : \ + SOUND_VOLUME_SIMPLE(v)) -static int playing_sounds = 0; -static struct SoundControl playlist[MAX_SOUNDS_PLAYING]; -static struct SoundControl emptySoundControl = +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(AUDIO_LINUX_IOCTL) -static boolean InitAudioDevice_Linux(); -#elif defined(PLATFORM_NETBSD) -static boolean InitAudioDevice_NetBSD(); -#elif defined(PLATFORM_HPUX) -static boolean InitAudioDevice_HPUX(); -#elif defined(PLATFORM_MSDOS) -static void SoundServer_InsertNewSound(struct SoundControl); -static void SoundServer_StopSound(int); -static void SoundServer_StopAllSounds(); -#endif + int nr; + int volume; + int stereo_position; -#if defined(PLATFORM_UNIX) -static int OpenAudioDevice(char *audio_device_name) -{ - int audio_fd; + int state; - /* check if desired audio device is accessible */ - if (access(audio_device_name, W_OK) != 0) - return -1; + unsigned int playing_starttime; + unsigned int playing_pos; - /* try to open audio device in non-blocking mode */ - if ((audio_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0) - return audio_fd; + 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; - /* re-open audio device in blocking mode */ - close(audio_fd); - audio_fd = open(audio_device_name, O_WRONLY); +static struct ArtworkListInfo *sound_info = NULL; +static struct ArtworkListInfo *music_info = NULL; - return audio_fd; -} +static MusicInfo **Music_NoConf = NULL; -static boolean TestAudioDevices(void) -{ - static char *audio_device_name[] = - { - DEVICENAME_DSP, - DEVICENAME_AUDIO - }; - int audio_fd = -1; - int i; +static int num_music_noconf = 0; +static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; - /* look for available audio devices, starting with preferred ones */ - for (i=0; i= 0) - break; +static char *currently_playing_music_filename = NULL; - if (audio_fd < 0) - { - Error(ERR_WARN, "cannot open audio device -- no sound"); - return FALSE; - } - close(audio_fd); +/* ========================================================================= */ +/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ - audio.device_name = audio_device_name[i]; +static struct SoundControl mixer[NUM_MIXER_CHANNELS]; +static int mixer_active_channels = 0; +static boolean expire_loop_sounds = FALSE; - return TRUE; -} +static void ReloadCustomSounds(); +static void ReloadCustomMusic(); +static void FreeSound(void *); +static void FreeMusic(void *); +static void FreeAllMusic_NoConf(); -#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 SoundInfo *getSoundInfoEntryFromSoundID(int); +static MusicInfo *getMusicInfoEntryFromMusicID(int); - if ((audio.soundserver_pid = fork()) < 0) - { - Error(ERR_WARN, "cannot create sound server process -- no sounds"); - return FALSE; - } - if (audio.soundserver_pid == 0) /* we are child */ - { - SoundServer(); +/* ------------------------------------------------------------------------- */ +/* mixer functions */ +/* ------------------------------------------------------------------------- */ - /* never reached */ - exit(0); - } - else /* we are parent */ - close(audio.soundserver_pipe[0]); /* no reading from pipe needed */ +void Mixer_InitChannels() +{ + int i; - return TRUE; + for (i = 0; i < audio.num_channels; i++) + mixer[i].active = FALSE; + mixer_active_channels = 0; } -#endif -void UnixOpenAudio(void) +static void Mixer_ResetChannelExpiration(int channel) { - if (!TestAudioDevices()) - return; - - audio.sound_available = TRUE; - audio.sound_enabled = TRUE; + mixer[channel].playing_starttime = Counter(); -#if defined(AUDIO_STREAMING_DSP) - audio.music_available = TRUE; - audio.loops_available = TRUE; -#endif + if (expire_loop_sounds && + IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel])) + Mix_ExpireChannel(channel, SOUND_LOOP_EXPIRATION_TIME); } -void UnixCloseAudio(void) +static boolean Mixer_ChannelExpired(int channel) { - if (audio.device_fd) - close(audio.device_fd); + if (!mixer[channel].active) + return TRUE; - if (audio.soundserver_pid) - kill(audio.soundserver_pid, SIGTERM); + if (expire_loop_sounds && + IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) && + DelayReached(&mixer[channel].playing_starttime, + SOUND_LOOP_EXPIRATION_TIME)) + return TRUE; + + if (!Mix_Playing(channel)) + return TRUE; + + return FALSE; } -#endif /* PLATFORM_UNIX */ -void InitPlaylist(void) +static boolean Mixer_AllocateChannel(int channel) { - int i; - - for(i=0;i= 0) - { - if (!playing_sounds) /* we just opened the audio device */ - { -#if defined(AUDIO_LINUX_IOCTL) - stereo = InitAudioDevice_Linux(fragment_size, sample_rate); -#elif defined(PLATFORM_NETBSD) - stereo = InitAudioDevice_NetBSD(fragment_size, sample_rate); -#endif - max_sample_size = fragment_size / (stereo ? 2 : 1); - } - - if (snd_ctrl.active) /* new sound has arrived */ - SoundServer_InsertNewSound(snd_ctrl); - - while(playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - /* first clear the last premixing buffer */ - memset(premix_last_buffer, 0, fragment_size * sizeof(int)); - - for(i=0;i= SOUND_FADING_VOLUME_THRESHOLD) - playlist[i].volume -= SOUND_FADING_VOLUME_STEP; - - /* adjust volume of actual sound sample */ - if (playlist[i].volume != PSND_MAX_VOLUME) - for(j=0;j> PSND_MAX_VOLUME_BITS; - - /* fill the last mixing buffer with stereo or mono sound */ - if (stereo) - { - int middle_pos = PSND_MAX_LEFT2RIGHT/2; - int left_volume = stereo_volume[middle_pos+playlist[i].stereo]; - int right_volume = stereo_volume[middle_pos-playlist[i].stereo]; - - for(j=0;j> PSND_MAX_LEFT2RIGHT_BITS; - premix_right_buffer[j] = - (right_volume * (int)premix_first_buffer[j]) - >> PSND_MAX_LEFT2RIGHT_BITS; - premix_last_buffer[2*j+0] += premix_left_buffer[j]; - premix_last_buffer[2*j+1] += premix_right_buffer[j]; - } - } - else - { - for(j=0;j= playlist[i].data_len) - { - if (playlist[i].loop) - playlist[i].playingpos = 0; - else - { - playlist[i] = emptySoundControl; - playing_sounds--; - } - } - else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD) - { - playlist[i] = emptySoundControl; - playing_sounds--; - } - } - - /* put last mixing buffer to final playing buffer */ - for(i=0; i255) - playing_buffer[i] = 255; - else - playing_buffer[i] = (premix_last_buffer[i]>>1)^0x80; - } - - /* finally play the sound fragment */ - write(audio.device_fd, playing_buffer, fragment_size); - } - - /* if no sounds playing, free device for other sound programs */ - if (!playing_sounds) - close(audio.device_fd); - } - } +static void Mixer_FadeChannel(int channel) +{ + if (!mixer[channel].active) + return; -#else /* !AUDIO_STREAMING_DSP */ + mixer[channel].state |= SND_CTRL_FADE; - if (snd_ctrl.active && !snd_ctrl.loop) - { - struct timeval delay = { 0, 0 }; - byte *sample_ptr; - long sample_size, max_sample_size = SND_BLOCKSIZE; - long sample_rate = 8000; /* standard "/dev/audio" sampling rate */ - int wait_percent = 90; /* wait 90% of the real playing time */ - int i; - - if ((audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0) - { - playing_sounds = 1; - - while(playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - /* get pointer and size of the actual sound sample */ - sample_ptr = snd_ctrl.data_ptr + snd_ctrl.playingpos; - sample_size = - MIN(max_sample_size, snd_ctrl.data_len - snd_ctrl.playingpos); - snd_ctrl.playingpos += sample_size; - - /* fill the first mixing buffer with original sample */ - memcpy(premix_first_buffer,sample_ptr,sample_size); - - /* adjust volume of actual sound sample */ - if (snd_ctrl.volume != PSND_MAX_VOLUME) - for(i=0;i> PSND_MAX_VOLUME_BITS; - - for(i=0;i= snd_ctrl.data_len) - playing_sounds = 0; - - /* finally play the sound fragment */ - write(audio.device_fd,playing_buffer,sample_size); - - delay.tv_sec = 0; - delay.tv_usec = ((sample_size*10*wait_percent)/(sample_rate))*1000; - } - close(audio.device_fd); - } - } -#endif /* !AUDIO_STREAMING_DSP */ - } + Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL); } -#endif /* PLATFORM_UNIX */ -#if defined(PLATFORM_MSDOS) -static void sound_handler(struct SoundControl snd_ctrl) +static void Mixer_FadeMusicChannel() { - int i; + Mixer_FadeChannel(audio.music_channel); - if (snd_ctrl.fade_sound) - { - if (!playing_sounds) - return; + Mix_FadeOutMusic(SOUND_FADING_INTERVAL); - for (i=0; i= num_music) /* invalid music */ + return; - for(i=0;ilongest) - { - longest=actual; - longest_nr=i; - } + snd_ctrl.nr = UNMAP_NOCONF_MUSIC(snd_ctrl.nr) % num_music_noconf; + snd_info = Music_NoConf[snd_ctrl.nr]; } -#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--; + else + snd_info = getMusicInfoEntryFromMusicID(snd_ctrl.nr); } + else + { + if (snd_ctrl.nr < 0 || snd_ctrl.nr >= num_sounds) + return; + + snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr); + } + + if (snd_info == NULL) + return; - /* check if sound is already being played (and how often) */ - for(k=0,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; + + /* play music samples on a dedicated music channel */ + if (IS_MUSIC(snd_ctrl)) { - if (playlist[i].nr == snd_ctrl.nr) - k++; + Mixer_StopMusicChannel(); + + mixer[audio.music_channel] = snd_ctrl; + Mixer_PlayMusicChannel(); + + setString(¤tly_playing_music_filename, + getBaseNamePtr(snd_info->source_filename)); + + return; } - /* restart loop sounds only if they are just fading out */ - if (k>=1 && snd_ctrl.loop) + /* 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++; + + /* reset expiration delay for already playing loop sounds */ + if (k > 0 && IS_LOOP(snd_ctrl)) { - for(i=0;i=2) + if (k >= 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=0;i=longest) + actual = 1000 * playing_time / mixer[i].data_len; + + if (actual >= longest) { - longest=actual; - longest_nr=i; + longest = actual; + longest_nr = i; } } -#if defined(PLATFORM_MSDOS) - voice_set_volume(playlist[longest_nr].voice, 0); - deallocate_voice(playlist[longest_nr].voice); -#endif - playlist[longest_nr] = emptySoundControl; - playing_sounds--; + Mixer_StopChannel(longest_nr); } - /* neuen Sound in Liste packen */ - for(i=0;i longest) + { + longest = actual; + longest_nr = i; + } + } + + 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); + break; } } } -#endif /* !PLATFORM_WIN32 */ -/* -void SoundServer_FadeSound(int nr) +static void HandleSoundRequest(SoundControl snd_ctrl) { int i; - if (!playing_sounds) - return; + /* 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 (IS_MUSIC(snd_ctrl)) + { + Mixer_FadeMusicChannel(); + return; + } - for(i=0;idata_ptr = Mix_LoadWAV(filename)) == NULL) { -#if defined(PLATFORM_MSDOS) - voice_set_volume(playlist[i].voice, 0); - deallocate_voice(playlist[i].voice); -#endif - playlist[i]=emptySoundControl; + Error(ERR_WARN, "cannot read sound file '%s': %s", filename, Mix_GetError()); + free(snd_info); + return NULL; } - playing_sounds = 0; -#if !defined(PLATFORM_MSDOS) - close(audio.device_fd); -#endif -} -#endif /* PLATFORM_MSDOS */ -#endif /* !PLATFORM_WIN32 */ + snd_info->data_len = ((Mix_Chunk *)snd_info->data_ptr)->alen; + snd_info->type = SND_TYPE_WAV; + snd_info->source_filename = getStringCopy(filename); -/* ------------------------------------------------------------------------- */ -/* platform dependant audio initialization code */ -/* ------------------------------------------------------------------------- */ + return snd_info; +} -#if defined(AUDIO_LINUX_IOCTL) -static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate) +static void *Load_MOD(char *filename) { - /* "ioctl()" expects pointer to 'int' value for stereo flag - (boolean is defined as 'char', which will not work here) */ - int stereo = TRUE; - unsigned long fragment_spec = 0; - - /* determine logarithm (log2) of the fragment size */ - for (fragment_spec=0; (1 << fragment_spec) < fragment_size; - fragment_spec++); - - /* use two fragments (play one fragment, prepare the other); - one fragment would result in interrupted audio output, more - than two fragments would raise audio output latency to much */ - fragment_spec |= 0x00020000; - - /* Example for fragment specification: - - 2 buffers / 512 bytes (giving 1/16 second resolution for 8 kHz) - - (with stereo the effective buffer size will shrink to 256) - => fragment_size = 0x00020009 */ - - if (ioctl(audio.device_fd, SNDCTL_DSP_SETFRAGMENT, &fragment_spec) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set fragment size of /dev/dsp -- no sounds"); - - /* try if we can use stereo sound */ - if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) - { -#ifdef DEBUG - static boolean reported = FALSE; + MusicInfo *mod_info; - if (!reported) - { - Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp"); - reported = TRUE; - } -#endif - stereo = FALSE; + if (!audio.sound_available) + return NULL; + + mod_info = checked_calloc(sizeof(MusicInfo)); + + if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL) + { + Error(ERR_WARN, "cannot read music file '%s': %s", filename, Mix_GetError()); + free(mod_info); + return NULL; } - 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"); + mod_info->type = MUS_TYPE_MOD; + mod_info->source_filename = getStringCopy(filename); - /* 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"); + return mod_info; +} - return (boolean)stereo; +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; } -#endif /* AUDIO_LINUX_IOCTL */ -#if defined(PLATFORM_NETBSD) -static boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate) +void LoadCustomMusic_NoConf(void) { - audio_info_t a_info; - boolean stereo = TRUE; + 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(); - 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; + + 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); - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + FreeAllMusic_NoConf(); + + if ((dir = openDirectory(music_directory)) == NULL) { - /* try to disable stereo */ - a_info.play.channels = 1; - stereo = FALSE; + Error(ERR_WARN, "cannot read music directory '%s'", music_directory); + + audio.music_available = FALSE; - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/audio -- no sounds"); + return; } - return stereo; + if (draw_init_text) + DrawInitText("Loading music", 120, FC_GREEN); + + 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; + + /* skip all music files that are configured in music config file */ + for (i = 0; i < num_music; i++) + { + struct FileInfo *music = getMusicListEntry(i); + + if (strEqual(basename, music->filename)) + { + music_already_used = TRUE; + break; + } + } + + if (music_already_used) + continue; + + if (draw_init_text) + DrawInitText(basename, 150, FC_YELLOW); + + if (FileIsMusic(dir_entry->filename)) + mus_info = Load_WAV_or_MOD(dir_entry->filename); + + 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; + } + } + + closeDirectory(dir); + + draw_init_text = FALSE; +} + +int getSoundListSize() +{ + return (sound_info->num_file_list_entries + + sound_info->num_dynamic_file_list_entries); } -#endif /* PLATFORM_NETBSD */ -#if defined(PLATFORM_HPUX) -static boolean InitAudioDevice_HPUX() +int getMusicListSize() { - struct audio_describe ainfo; - int audio_ctl; + return (music_info->num_file_list_entries + + music_info->num_dynamic_file_list_entries); +} - audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); - if (audio_ctl == -1) - Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); +struct FileInfo *getSoundListEntry(int pos) +{ + int num_list_entries = sound_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); - if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds"); + return (pos < num_list_entries ? &sound_info->file_list[list_pos] : + &sound_info->dynamic_file_list[list_pos]); +} - if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) - Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds"); +struct FileInfo *getMusicListEntry(int pos) +{ + int num_list_entries = music_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); - ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); - ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); + return (pos < num_list_entries ? &music_info->file_list[list_pos] : + &music_info->dynamic_file_list[list_pos]); +} - close(audio_ctl); +static SoundInfo *getSoundInfoEntryFromSoundID(int pos) +{ + 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); - return TRUE; /* to provide common interface for InitAudioDevice_...() */ + return snd_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) + +static MusicInfo *getMusicInfoEntryFromMusicID(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 + 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); - return(ulawbyte); + return mus_info[list_pos]; } -/* -** 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() { - 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 */ +int getSoundListPropertyMappingSize() +{ + return sound_info->num_property_mapping_entries; +} -/* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ -/* ========================================================================= */ -/* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS */ +int getMusicListPropertyMappingSize() +{ + return music_info->num_property_mapping_entries; +} +struct PropertyMapping *getSoundListPropertyMapping() +{ + return sound_info->property_mapping; +} -#define CHUNK_ID_LEN 4 /* IFF style chunk id length */ -#define WAV_HEADER_SIZE 20 /* size of WAV file header */ +struct PropertyMapping *getMusicListPropertyMapping() +{ + return music_info->property_mapping; +} -static boolean LoadSoundExt(char *sound_name, boolean is_music) +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) { - struct SampleInfo *snd_info; - char *filename; -#if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS) - byte sound_header_buffer[WAV_HEADER_SIZE]; - char chunk[CHUNK_ID_LEN + 1]; - int chunk_size, dummy; - FILE *file; int i; -#endif - if (!audio.sound_available) - return FALSE; + sound_info = checked_calloc(sizeof(struct ArtworkListInfo)); + sound_info->type = ARTWORK_TYPE_SOUNDS; - num_sounds++; - Sound = checked_realloc(Sound, num_sounds * sizeof(struct SampleInfo)); + /* ---------- initialize file list and suffix lists ---------- */ - snd_info = &Sound[num_sounds - 1]; - snd_info->name = sound_name; + sound_info->num_file_list_entries = num_file_list_entries; + sound_info->num_dynamic_file_list_entries = 0; - filename = getPath2((is_music ? options.music_directory : - options.sounds_directory), snd_info->name); + sound_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + sound_info->dynamic_file_list = NULL; -#if defined(TARGET_SDL) + sound_info->num_suffix_list_entries = 0; + for (i = 0; config_suffix_list[i].token != NULL; i++) + sound_info->num_suffix_list_entries++; - if ((snd_info->mix_chunk = Mix_LoadWAV(filename)) == NULL) - { - Error(ERR_WARN, "cannot read sound file '%s' -- no sounds", filename); - free(filename); - return FALSE; - } + sound_info->suffix_list = config_suffix_list; -#elif defined(PLATFORM_UNIX) + /* ---------- initialize base prefix and suffixes lists ---------- */ - if ((file = fopen(filename, MODE_READ)) == NULL) - { - Error(ERR_WARN, "cannot open sound file '%s' -- no sounds", filename); - free(filename); - return FALSE; - } + sound_info->num_base_prefixes = 0; + for (i = 0; base_prefixes[i] != NULL; i++) + sound_info->num_base_prefixes++; - /* read chunk "RIFF" */ - getFileChunk(file, chunk, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk, "RIFF") != 0) - { - Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); - fclose(file); - free(filename); - return FALSE; - } + sound_info->num_ext1_suffixes = 0; + for (i = 0; ext1_suffixes[i] != NULL; i++) + sound_info->num_ext1_suffixes++; - /* 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); - free(filename); - return FALSE; - } + sound_info->num_ext2_suffixes = 0; + for (i = 0; ext2_suffixes[i] != NULL; i++) + sound_info->num_ext2_suffixes++; - /* read header information */ - for (i=0; inum_ext3_suffixes = 0; + for (i = 0; ext3_suffixes[i] != NULL; i++) + sound_info->num_ext3_suffixes++; - /* read chunk "data" */ - getFileChunk(file, chunk, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk, "data") != 0) - { - Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename); - fclose(file); - free(filename); - return FALSE; - } + sound_info->num_ignore_tokens = 0; + for (i = 0; ignore_tokens[i] != NULL; i++) + sound_info->num_ignore_tokens++; - snd_info->data_len = chunk_size; - snd_info->data_ptr = checked_malloc(snd_info->data_len); + 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; - /* 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); - free(filename); - return FALSE; - } + sound_info->num_property_mapping_entries = 0; - fclose(file); + sound_info->property_mapping = NULL; - for (i=0; idata_len; i++) - snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80; + /* ---------- initialize artwork reference and content lists ---------- */ -#else /* PLATFORM_MSDOS */ + sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *); - 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; - } + sound_info->artwork_list = + checked_calloc(num_file_list_entries * sizeof(SoundInfo *)); + sound_info->dynamic_artwork_list = NULL; -#endif + sound_info->content_list = NULL; - free(filename); + /* ---------- initialize artwork loading/freeing functions ---------- */ - return TRUE; + sound_info->load_artwork = Load_WAV; + sound_info->free_artwork = FreeSound; } -boolean LoadSound(char *sound_name) +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) { - return LoadSoundExt(sound_name, FALSE); -} + int i; -boolean LoadMod(char *mod_name) -{ -#if defined(TARGET_SDL) - struct SampleInfo *mod_info; - char *filename; + music_info = checked_calloc(sizeof(struct ArtworkListInfo)); + music_info->type = ARTWORK_TYPE_MUSIC; - num_mods++; - Mod = checked_realloc(Mod, num_mods * sizeof(struct SampleInfo)); + /* ---------- initialize file list and suffix lists ---------- */ - mod_info = &Mod[num_mods - 1]; - mod_info->name = mod_name; + music_info->num_file_list_entries = num_file_list_entries; + music_info->num_dynamic_file_list_entries = 0; - filename = getPath2(options.music_directory, mod_info->name); + music_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + music_info->dynamic_file_list = NULL; - if ((mod_info->mix_music = Mix_LoadMUS(filename)) == NULL) - { - Error(ERR_WARN, "cannot read music file '%s' -- no music", filename); - free(filename); - return FALSE; - } + music_info->num_suffix_list_entries = 0; + for (i = 0; config_suffix_list[i].token != NULL; i++) + music_info->num_suffix_list_entries++; - free(filename); + music_info->suffix_list = config_suffix_list; - return TRUE; -#else - return FALSE; -#endif -} + /* ---------- initialize base prefix and suffixes lists ---------- */ -int LoadMusic(void) -{ - DIR *dir; - struct dirent *dir_entry; - int num_wav_music = 0; - int num_mod_music = 0; + music_info->num_base_prefixes = 0; + for (i = 0; base_prefixes[i] != NULL; i++) + music_info->num_base_prefixes++; - if (!audio.sound_available) - return 0; + music_info->num_ext1_suffixes = 0; + for (i = 0; ext1_suffixes[i] != NULL; i++) + music_info->num_ext1_suffixes++; - if ((dir = opendir(options.music_directory)) == NULL) - { - Error(ERR_WARN, "cannot read music directory '%s'", - options.music_directory); - audio.music_available = FALSE; - return 0; - } + music_info->num_ext2_suffixes = 0; + for (i = 0; ext2_suffixes[i] != NULL; i++) + music_info->num_ext2_suffixes++; - while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ - { - char *filename = dir_entry->d_name; + music_info->num_ext3_suffixes = 0; + for (i = 0; ext3_suffixes[i] != NULL; i++) + music_info->num_ext3_suffixes++; - if (strlen(filename) > 4 && - strcmp(&filename[strlen(filename) - 4], ".wav") == 0) - { - if (LoadSoundExt(filename, TRUE)) - num_wav_music++; - } - else if (strlen(filename) > 4 && - (strcmp(&filename[strlen(filename) - 4], ".mod") == 0 || - strcmp(&filename[strlen(filename) - 4], ".MOD") == 0 || - strncmp(filename, "mod.", 4) == 0 || - strncmp(filename, "MOD.", 4) == 0)) - { - if (LoadMod(filename)) - num_mod_music++; - } - } + music_info->num_ignore_tokens = 0; + for (i = 0; ignore_tokens[i] != NULL; i++) + music_info->num_ignore_tokens++; - closedir(dir); + 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; - if (num_wav_music == 0 && num_mod_music == 0) - Error(ERR_WARN, "cannot find any valid music files in directory '%s'", - options.music_directory); + music_info->num_property_mapping_entries = 0; - num_music = (num_mod_music > 0 ? num_mod_music : num_wav_music); + music_info->property_mapping = NULL; - audio.mods_available = (num_mod_music > 0); - audio.music_available = (num_music > 0); + /* ---------- initialize artwork reference and content lists ---------- */ - return num_music; + 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; + + /* ---------- initialize artwork loading/freeing functions ---------- */ + + music_info->load_artwork = Load_WAV_or_MOD; + music_info->free_artwork = FreeMusic; } void PlayMusic(int nr) @@ -1116,202 +885,238 @@ void PlayMusic(int nr) if (!audio.music_available) return; - if (!audio.mods_available) - nr = num_sounds - num_music + nr; - -#if defined(TARGET_SDL) - if (audio.mods_available) /* play MOD music */ - { - Mix_PlayMusic(Mod[nr].mix_music, -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, Sound[nr].mix_chunk, -1); - } -#else - audio.music_nr = nr; - PlaySoundLoop(nr); -#endif + PlaySoundMusic(nr); } void PlaySound(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_NO_LOOP); + 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 (!audio.sound_available || !audio.sound_enabled) + if (!setup.sound_music) return; - if (volumePSND_MAX_VOLUME) - volume = PSND_MAX_VOLUME; - - if (stereoPSND_MAX_RIGHT) - stereo = PSND_MAX_RIGHT; - - snd_ctrl.nr = nr; - snd_ctrl.volume = volume; - snd_ctrl.stereo = stereo; - snd_ctrl.loop = loop; - snd_ctrl.active = TRUE; - snd_ctrl.data_ptr = Sound[nr].data_ptr; - snd_ctrl.data_len = Sound[nr].data_len; - -#if defined(TARGET_SDL) - Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_PlayChannel(-1, Sound[nr].mix_chunk, (loop ? -1 : 0)); -#elif defined(PLATFORM_UNIX) - if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0) - { - Error(ERR_WARN, "cannot pipe to child process -- no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC); +} + +void PlaySoundExt(int nr, int volume, int stereo_position, int state) +{ + SoundControl snd_ctrl; + + if (!audio.sound_available || + !audio.sound_enabled || + audio.sound_deactivated) return; - } -#elif defined(PLATFORM_MSDOS) - sound_handler(snd_ctrl); -#endif + + 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_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.volume = volume; + snd_ctrl.stereo_position = stereo_position; + snd_ctrl.state = state; + + HandleSoundRequest(snd_ctrl); } void FadeMusic(void) { -#if defined(TARGET_SDL) - if (!audio.sound_available) + if (!audio.music_available) return; - if (audio.mods_available) - Mix_FadeOutMusic(SOUND_FADING_INTERVAL); - else - Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); -#else - FadeSound(audio.music_nr); -#endif + StopSoundExt(-1, SND_CTRL_FADE_MUSIC); } void FadeSound(int nr) { - StopSoundExt(nr, SSND_FADE_SOUND); + StopSoundExt(nr, SND_CTRL_FADE_SOUND); } void FadeSounds() { + StopSoundExt(-1, SND_CTRL_FADE_ALL); +} + +void FadeSoundsAndMusic() +{ + FadeSounds(); FadeMusic(); - StopSoundExt(-1, SSND_FADE_ALL_SOUNDS); } void StopMusic(void) { -#if defined(TARGET_SDL) - if (!audio.sound_available) + if (!audio.music_available) return; - if (audio.mods_available) - Mix_HaltMusic(); - else - Mix_HaltChannel(audio.music_channel); -#else - StopSound(audio.music_nr); -#endif + StopSoundExt(-1, SND_CTRL_STOP_MUSIC); } void StopSound(int nr) { - StopSoundExt(nr, SSND_STOP_SOUND); + StopSoundExt(nr, SND_CTRL_STOP_SOUND); } void StopSounds() { - StopSoundExt(-1, SSND_STOP_ALL_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.active = FALSE; + snd_ctrl.nr = nr; + snd_ctrl.state = state; + + HandleSoundRequest(snd_ctrl); +} + +void ExpireSoundLoops(boolean active) +{ + SoundControl snd_ctrl; + + 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() +{ + LoadArtworkConfig(sound_info); + ReloadCustomArtworkList(sound_info); +} + +static void ReloadCustomMusic() +{ + 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) { - snd_ctrl.nr = nr; - snd_ctrl.stop_sound = TRUE; + Mix_FreeChunk(sound->data_ptr); } -#if defined(TARGET_SDL) + checked_free(sound->source_filename); - if (SSND_FADING(method)) - { - int i; + free(sound); +} - for (i=0; idata_ptr) { - Error(ERR_WARN, "cannot pipe to child process -- no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; - return; + 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() { int i; - if (!audio.sound_available) + if (Music_NoConf == NULL) return; - for(i=0; i