X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=144dd1ad5dccc26ee07e419f34b81fb7cd168ece;hb=caed1f8c1a80db15b94da8a59bba3e95f7bd06db;hp=13a7ca046f96400f6a6d1dc3d3bc0d86d363e3eb;hpb=01a911493067452c475a31b76a3b33154b6dd10f;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 13a7ca04..144dd1ad 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2000 Artsoft Entertainment * +* (c) 1994-2001 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -21,34 +21,34 @@ #include "system.h" #include "sound.h" #include "misc.h" +#include "setup.h" +static SoundInfo **Sound = NULL; +static MusicInfo **Music = NULL; static int num_sounds = 0, num_music = 0; -static struct SampleInfo *Sound = NULL; -#if defined(TARGET_SDL) -static int num_mods = 0; -static struct SampleInfo *Mod = NULL; -#endif -/*** THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/ +/* ========================================================================= */ +/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ static int playing_sounds = 0; static struct SoundControl playlist[MAX_SOUNDS_PLAYING]; static struct SoundControl emptySoundControl = { - -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL + -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0, 0,NULL }; #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]; +static short premix_second_buffer[SND_BLOCKSIZE]; +static short premix_left_buffer[SND_BLOCKSIZE]; +static short premix_right_buffer[SND_BLOCKSIZE]; +static long premix_last_buffer[SND_BLOCKSIZE]; #endif -static unsigned char playing_buffer[SND_BLOCKSIZE]; +static short playing_buffer[SND_BLOCKSIZE]; #endif /* forward declaration of internal functions */ @@ -59,13 +59,15 @@ static unsigned char linear_to_ulaw(int); static int ulaw_to_linear(unsigned char); #endif -#if defined(PLATFORM_HPUX) -static void HPUX_Audio_Control(); -#endif - -#if defined(PLATFORM_MSDOS) +#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_StopSound(struct SoundControl); static void SoundServer_StopAllSounds(); #endif @@ -106,7 +108,7 @@ static boolean TestAudioDevices(void) if (audio_fd < 0) { - Error(ERR_WARN, "cannot open audio device - no sound"); + Error(ERR_WARN, "cannot open audio device -- no sound"); return FALSE; } @@ -122,17 +124,17 @@ static boolean ForkAudioProcess(void) { if (pipe(audio.soundserver_pipe) < 0) { - Error(ERR_WARN, "cannot create pipe - no sounds"); + Error(ERR_WARN, "cannot create pipe -- no sounds"); return FALSE; } if ((audio.soundserver_pid = fork()) < 0) { - Error(ERR_WARN, "cannot create sound server process - no sounds"); + Error(ERR_WARN, "cannot create sound server process -- no sounds"); return FALSE; } - if (audio.soundserver_pid == 0) /* we are child */ + if (audio.soundserver_pid == 0) /* we are child process */ { SoundServer(); @@ -165,7 +167,7 @@ void UnixCloseAudio(void) if (audio.device_fd) close(audio.device_fd); - if (audio.soundserver_pid) + if (audio.soundserver_pid > 0) /* we are parent process */ kill(audio.soundserver_pid, SIGTERM); } #endif /* PLATFORM_UNIX */ @@ -174,13 +176,16 @@ void InitPlaylist(void) { int i; - for(i=0;ifullpath != NULL) + free(leveldir_current->fullpath); + if (ti->basepath != NULL) + free(ti->basepath); + if (ti->fullpath != NULL) + free(ti->fullpath); + + if (read(audio.soundserver_pipe[0], set_name, + snd_ctrl.data_len) != snd_ctrl.data_len || + read(audio.soundserver_pipe[0], leveldir_current, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.soundserver_pipe[0], ti, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.soundserver_pipe[0], &str_size1, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.soundserver_pipe[0], &str_size2, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.soundserver_pipe[0], &str_size3, + sizeof(unsigned long)) != sizeof(unsigned long)) + Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); + + leveldir_current->fullpath = checked_calloc(str_size1); + ti->basepath = checked_calloc(str_size2); + ti->fullpath = checked_calloc(str_size3); + + if (read(audio.soundserver_pipe[0], leveldir_current->fullpath, + str_size1) != str_size1 || + read(audio.soundserver_pipe[0], ti->basepath, + str_size2) != str_size2 || + read(audio.soundserver_pipe[0], ti->fullpath, + str_size3) != str_size3) + Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); + + InitPlaylist(); + + close(audio.device_fd); + + if (snd_ctrl.reload_sounds) + { + artwork.sounds_set_current = set_name; + audio.func_reload_sounds(); + } + else + { + artwork.music_set_current = set_name; + audio.func_reload_music(); + } + + free(set_name); + + continue; + } #if defined(AUDIO_STREAMING_DSP) @@ -228,18 +298,22 @@ void SoundServer(void) if (!playing_sounds) continue; - for(i=0;i= 0) { if (!playing_sounds) /* we just opened the audio device */ { - unsigned long fragment_spec = 0; - - /* determine logarithm (log2) of the fragment size */ - for (fragment_spec=0; (1 << fragment_spec) < fragment_size; - fragment_spec++); - - /* use two fragments (play one fragment, prepare the other); - one fragment would result in interrupted audio output, more - than two fragments would raise audio output latency to much */ - fragment_spec |= 0x00020000; - - /* Example for fragment specification: - - 2 buffers / 512 bytes (giving 1/16 second resolution for 8 kHz) - - (with stereo the effective buffer size will shrink to 256) - => fragment_size = 0x00020009 */ - - if (ioctl(audio.device_fd,SNDCTL_DSP_SETFRAGMENT,&fragment_spec) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set fragment size of /dev/dsp - no sounds"); - - /* try if we can use stereo sound */ - if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) - { -#ifdef DEBUG - static boolean reported = FALSE; - - if (!reported) - { - Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp"); - reported = TRUE; - } +#if defined(AUDIO_LINUX_IOCTL) + stereo = InitAudioDevice_Linux(fragment_size, sample_rate); +#elif defined(PLATFORM_NETBSD) + stereo = InitAudioDevice_NetBSD(fragment_size, sample_rate); #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); + max_sample_size = fragment_size / ((stereo ? 2 : 1) * sizeof(short)); } 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) + 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)); + memset(premix_last_buffer, 0, fragment_size * sizeof(short)); - for(i=0;i= SOUND_FADING_VOLUME_THRESHOLD) @@ -367,34 +412,35 @@ void SoundServer(void) /* 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]; + 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]) + (right_volume * premix_second_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]; + + premix_last_buffer[2 * j + 0] += premix_left_buffer[j]; + premix_last_buffer[2 * j + 1] += premix_right_buffer[j]; } } else { - for(j=0;j255) - playing_buffer[i] = 255; + if (premix_last_buffer[i] < -65535) + playing_buffer[i] = -32767; + else if (premix_last_buffer[i] > 65535) + playing_buffer[i] = 32767; else - playing_buffer[i] = (premix_last_buffer[i]>>1)^0x80; + playing_buffer[i] = (short)(premix_last_buffer[i] >> 1); } /* finally play the sound fragment */ @@ -451,9 +497,9 @@ void SoundServer(void) { playing_sounds = 1; - while(playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) + while (playing_sounds && + select(audio.soundserver_pipe[0] + 1, + &sound_fdset, NULL, NULL, &delay) < 1) { FD_SET(audio.soundserver_pipe[0], &sound_fdset); @@ -466,7 +512,6 @@ void SoundServer(void) /* 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;ilongest) + if (i != audio.music_channel && !playlist[i].loop && actual > longest) { - longest=actual; - longest_nr=i; + longest = actual; + longest_nr = i; } } #if defined(PLATFORM_MSDOS) @@ -581,18 +631,17 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl) } /* check if sound is already being played (and how often) */ - for(k=0,i=0;i=1 && snd_ctrl.loop) + if (k >= 1 && snd_ctrl.loop) { - for(i=0;i=2) + if (k >= 2) { - int longest=0, longest_nr=0; + int longest = 0, longest_nr = 0; /* look for oldest equal sound */ - for(i=0;i=longest) + if (actual >= longest) { - longest=actual; - longest_nr=i; + longest = actual; + longest_nr = i; } } @@ -639,18 +691,27 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl) playing_sounds--; } - /* neuen Sound in Liste packen */ - for(i=0;idata_ptr; + snd_ctrl.data_len = snd_info->data_len; + 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) + playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr); + + if (snd_ctrl.loop) voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP); + voice_set_volume(playlist[i].voice, snd_ctrl.volume); voice_set_pan(playlist[i].voice, snd_ctrl.stereo); voice_start(playlist[i].voice); @@ -677,15 +738,18 @@ void SoundServer_FadeSound(int nr) #if !defined(PLATFORM_WIN32) #if defined(PLATFORM_MSDOS) -static void SoundServer_StopSound(int nr) +static void SoundServer_StopSound(struct SoundControl snd_ctrl) { + int nr = snd_ctrl.nr; int i; if (!playing_sounds) return; - for(i=0;i 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"); + + audio_format = AFMT_S16_LE; + if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set audio format 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_query) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot get fragment size of /dev/dsp -- no sounds"); + if (fragment_size_query != fragment_size) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set fragment size of /dev/dsp -- no sounds"); + + return (boolean)stereo; +} +#endif /* AUDIO_LINUX_IOCTL */ + +#if defined(PLATFORM_NETBSD) +static boolean InitAudioDevice_NetBSD(int fragment_size, int sample_rate) +{ + audio_info_t a_info; + boolean stereo = TRUE; + + AUDIO_INITINFO(&a_info); + a_info.play.encoding = AUDIO_ENCODING_LINEAR8; + a_info.play.precision = 8; + a_info.play.channels = 2; + a_info.play.sample_rate = sample_rate; + a_info.blocksize = fragment_size; + + if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + { + /* try to disable stereo */ + a_info.play.channels = 1; + stereo = FALSE; + + if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set sample rate of /dev/audio -- no sounds"); + } + + return stereo; +} +#endif /* PLATFORM_NETBSD */ + #if defined(PLATFORM_HPUX) -static void HPUX_Audio_Control() +static boolean InitAudioDevice_HPUX() { 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"); + Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - Error(ERR_EXIT_SOUND_SERVER, "no audio info - no sounds"); + Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds"); if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) - Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available - no sounds"); + Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds"); ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); close(audio_ctl); + + return TRUE; /* to provide common interface for InitAudioDevice_...() */ } #endif /* PLATFORM_HPUX */ @@ -852,197 +1015,230 @@ static int ulaw_to_linear(unsigned char ulawbyte) } #endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */ -/*** THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS ***/ -/*===========================================================================*/ - -/*** THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS ***/ +/* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ +/* ========================================================================= */ +/* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS */ #define CHUNK_ID_LEN 4 /* IFF style chunk id length */ -#define WAV_HEADER_SIZE 20 /* size of WAV file header */ +#define WAV_HEADER_SIZE 16 /* size of WAV file header */ -static boolean LoadSoundExt(char *sound_name, boolean is_music) +static SoundInfo *Load_WAV(char *filename) { - struct SampleInfo *snd_info; - char filename[256]; + SoundInfo *snd_info; #if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS) byte sound_header_buffer[WAV_HEADER_SIZE]; - char chunk[CHUNK_ID_LEN + 1]; - int chunk_length, dummy; + char chunk_name[CHUNK_ID_LEN + 1]; + int chunk_size; FILE *file; int i; #endif - num_sounds++; - Sound = checked_realloc(Sound, num_sounds * sizeof(struct SampleInfo)); - - snd_info = &Sound[num_sounds - 1]; - snd_info->name = sound_name; + if (!audio.sound_available) + return NULL; - sprintf(filename, "%s/%s/%s", options.ro_base_directory, - (is_music ? MUSIC_DIRECTORY : SOUNDS_DIRECTORY), snd_info->name); + snd_info = checked_calloc(sizeof(SoundInfo)); #if defined(TARGET_SDL) - if ((snd_info->mix_chunk = Mix_LoadWAV(filename)) == NULL) + if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL) { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); - return FALSE; + Error(ERR_WARN, "cannot read sound file '%s'", filename); + free(snd_info); + return NULL; } -#elif defined(PLATFORM_UNIX) +#elif defined(TARGET_ALLEGRO) + + if ((snd_info->data_ptr = load_sample(filename)) == NULL) + { + Error(ERR_WARN, "cannot read sound file '%s'", filename); + free(snd_info); + return NULL; + } + +#else /* PLATFORM_UNIX */ if ((file = fopen(filename, MODE_READ)) == NULL) { - Error(ERR_WARN, "cannot open sound file '%s' - no sounds", filename); - return FALSE; + Error(ERR_WARN, "cannot open sound file '%s'", filename); + free(snd_info); + return NULL; } - /* read chunk "RIFF" */ - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk, "RIFF") != 0) + /* read chunk id "RIFF" */ + getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN); + if (strcmp(chunk_name, "RIFF") != 0) { Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); fclose(file); - return FALSE; + free(snd_info); + return NULL; } - /* read chunk "WAVE" */ - getFileChunk(file, chunk, &dummy, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk, "WAVE") != 0) + /* read "RIFF" type id "WAVE" */ + getFileChunk(file, chunk_name, NULL, BYTE_ORDER_LITTLE_ENDIAN); + if (strcmp(chunk_name, "WAVE") != 0) { - Error(ERR_WARN, "missing 'WAVE' chunk of sound file '%s'", filename); + Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename); fclose(file); - return FALSE; + free(snd_info); + return NULL; } - /* read header information */ - for (i=0; idata_len = chunk_length; - snd_info->data_ptr = checked_malloc(snd_info->data_len); + if (chunk_size > WAV_HEADER_SIZE) + ReadUnusedBytesFromFile(file, chunk_size - WAV_HEADER_SIZE); + } + else if (strcmp(chunk_name, "data") == 0) + { + snd_info->data_len = chunk_size; + snd_info->data_ptr = checked_malloc(snd_info->data_len); - /* read sound data */ - if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) != - snd_info->data_len) - { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); - fclose(file); - return FALSE; + /* read sound data */ + if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) != + snd_info->data_len) + { + Error(ERR_WARN,"cannot read 'data' chunk of sound file '%s'",filename); + fclose(file); + free(snd_info->data_ptr); + free(snd_info); + return NULL; + } + + /* check for odd number of sample bytes (data chunk is word aligned) */ + if ((chunk_size % 2) == 1) + ReadUnusedBytesFromFile(file, 1); + } + else /* unknown chunk -- ignore */ + ReadUnusedBytesFromFile(file, chunk_size); } fclose(file); + if (snd_info->data_ptr == NULL) + { + Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename); + free(snd_info); + return NULL; + } + for (i=0; idata_len; i++) - snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80; + ((byte *)snd_info->data_ptr)[i] ^= 0x80; -#else /* PLATFORM_MSDOS */ +#endif /* PLATFORM_UNIX */ + + snd_info->type = SND_TYPE_WAV; + snd_info->source_filename = getStringCopy(filename); - snd_info->sample_ptr = load_sample(filename); - if (!snd_info->sample_ptr) + return snd_info; +} + +SoundInfo *LoadCustomSound(char *basename) +{ + char *filename = getCustomSoundFilename(basename); + + if (filename == NULL) { - Error(ERR_WARN, "cannot read sound file '%s' - no sounds", filename); + Error(ERR_WARN, "cannot find sound file '%s'", basename); return FALSE; } -#endif + return Load_WAV(filename); +} - return TRUE; +void InitSoundList(int num_list_entries) +{ + Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *)); + num_sounds = num_list_entries; } -boolean LoadSound(char *sound_name) +void LoadSoundToList(char *basename, int list_pos) { - return LoadSoundExt(sound_name, FALSE); + if (Sound == NULL || list_pos >= num_sounds) + return; + + if (Sound[list_pos]) + FreeSound(Sound[list_pos]); + + Sound[list_pos] = LoadCustomSound(basename); } -boolean LoadMod(char *mod_name) +static MusicInfo *Load_MOD(char *filename) { #if defined(TARGET_SDL) - struct SampleInfo *mod_info; - char filename[256]; + MusicInfo *mod_info; - num_mods++; - Mod = checked_realloc(Mod, num_mods * sizeof(struct SampleInfo)); - - mod_info = &Mod[num_mods - 1]; - mod_info->name = mod_name; + if (!audio.sound_available) + return NULL; - sprintf(filename, "%s/%s/%s", options.ro_base_directory, - MUSIC_DIRECTORY, mod_info->name); + mod_info = checked_calloc(sizeof(MusicInfo)); - if ((mod_info->mix_music = Mix_LoadMUS(filename)) == NULL) + if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL) { - Error(ERR_WARN, "cannot read music file '%s' - no music", filename); - return FALSE; + Error(ERR_WARN, "cannot read music file '%s'", filename); + free(mod_info); + return NULL; } - return TRUE; + mod_info->type = MUS_TYPE_MOD; + mod_info->source_filename = getStringCopy(filename); + + return mod_info; #else - return FALSE; + return NULL; #endif } -int LoadMusic(void) +void LoadCustomMusic(void) { + char *music_directory = getCustomMusicDirectory(); DIR *dir; struct dirent *dir_entry; - char *music_directory = getPath2(options.ro_base_directory, MUSIC_DIRECTORY); - int num_wav_music = 0; - int num_mod_music = 0; + + if (!audio.sound_available) + return; if ((dir = opendir(music_directory)) == NULL) { Error(ERR_WARN, "cannot read music directory '%s'", music_directory); audio.music_available = FALSE; - free(music_directory); - return 0; + return; } while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ { - char *filename = dir_entry->d_name; + char *basename = dir_entry->d_name; + char *filename = getPath2(music_directory, basename); + MusicInfo *mus_info = NULL; - if (strlen(filename) > 4 && - strcmp(&filename[strlen(filename) - 4], ".wav") == 0) - { - if (LoadSoundExt(filename, TRUE)) - num_wav_music++; - } - else if (strlen(filename) > 4 && - (strcmp(&filename[strlen(filename) - 4], ".mod") == 0 || - strcmp(&filename[strlen(filename) - 4], ".MOD") == 0 || - strncmp(filename, "mod.", 4) == 0 || - strncmp(filename, "MOD.", 4) == 0)) + if (FileIsSound(basename)) + mus_info = Load_WAV(filename); + else if (FileIsMusic(basename)) + mus_info = Load_MOD(filename); + + free(filename); + + if (mus_info) { - if (LoadMod(filename)) - num_mod_music++; + num_music++; + Music = checked_realloc(Music, num_music * sizeof(MusicInfo *)); + Music[num_music -1] = mus_info; } } closedir(dir); - if (num_wav_music == 0 && num_mod_music == 0) + if (num_music == 0) Error(ERR_WARN, "cannot find any valid music files in directory '%s'", music_directory); - - free(music_directory); - - num_music = (num_mod_music > 0 ? num_mod_music : num_wav_music); - - audio.mods_available = (num_mod_music > 0); - audio.music_available = (num_music > 0); - - return num_music; } void PlayMusic(int nr) @@ -1050,23 +1246,25 @@ 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 */ + + nr = nr % num_music; + + if (Music[nr]->type == MUS_TYPE_MOD) { - Mix_VolumeMusic(SOUND_MAX_VOLUME); - Mix_PlayMusic(Mod[nr].mix_music, -1); + 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, Sound[nr].mix_chunk, -1); + Mix_PlayChannel(audio.music_channel, Music[nr]->data_ptr, -1); } + #else - audio.music_nr = nr; - PlaySoundLoop(nr); + + PlaySoundMusic(nr); + #endif } @@ -1085,38 +1283,52 @@ void PlaySoundLoop(int nr) PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP); } -void PlaySoundExt(int nr, int volume, int stereo, boolean loop) +void PlaySoundMusic(int nr) +{ + PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_MUSIC); +} + +void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type) { struct SoundControl snd_ctrl = emptySoundControl; - if (!audio.sound_available || !audio.sound_enabled) + if (!audio.sound_available || + !audio.sound_enabled || + audio.sound_deactivated) return; - if (volumePSND_MAX_VOLUME) + else if (volume > PSND_MAX_VOLUME) volume = PSND_MAX_VOLUME; - if (stereoPSND_MAX_RIGHT) + else if (stereo > PSND_MAX_RIGHT) stereo = PSND_MAX_RIGHT; snd_ctrl.nr = nr; snd_ctrl.volume = volume; snd_ctrl.stereo = stereo; - snd_ctrl.loop = loop; + snd_ctrl.loop = (loop_type != PSND_NO_LOOP); + snd_ctrl.music = (loop_type == PSND_MUSIC); snd_ctrl.active = TRUE; + +#if 0 snd_ctrl.data_ptr = Sound[nr].data_ptr; snd_ctrl.data_len = Sound[nr].data_len; +#endif #if defined(TARGET_SDL) Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_PlayChannel(-1, Sound[nr].mix_chunk, (loop ? -1 : 0)); + Mix_PlayChannel(-1, Sound[nr]->data_ptr, (loop_type ? -1 : 0)); #elif defined(PLATFORM_UNIX) + if (audio.soundserver_pid == 0) /* we are child process */ + return; + if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0) { - Error(ERR_WARN, "cannot pipe to child process - no sounds"); + Error(ERR_WARN, "cannot pipe to child process -- no sounds"); audio.sound_available = audio.sound_enabled = FALSE; return; } @@ -1127,13 +1339,14 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop) void FadeMusic(void) { + if (!audio.sound_available) + return; + #if defined(TARGET_SDL) - if (audio.mods_available) - Mix_FadeOutMusic(SOUND_FADING_INTERVAL); - else - Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); + Mix_FadeOutMusic(SOUND_FADING_INTERVAL); + Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); #else - FadeSound(audio.music_nr); + StopSoundExt(-1, SSND_FADE_MUSIC); #endif } @@ -1144,18 +1357,20 @@ void FadeSound(int nr) void FadeSounds() { - StopSoundExt(-1, SSND_FADE_ALL_SOUNDS); + FadeMusic(); + StopSoundExt(-1, SSND_FADE_ALL); } void StopMusic(void) { #if defined(TARGET_SDL) - if (audio.mods_available) - Mix_HaltMusic(); - else - Mix_HaltChannel(audio.music_channel); + if (!audio.sound_available) + return; + + Mix_HaltMusic(); + Mix_HaltChannel(audio.music_channel); #else - StopSound(audio.music_nr); + StopSoundExt(-1, SSND_STOP_MUSIC); #endif } @@ -1166,7 +1381,7 @@ void StopSound(int nr) void StopSounds() { - StopSoundExt(-1, SSND_STOP_ALL_SOUNDS); + StopSoundExt(-1, SSND_STOP_ALL); } void StopSoundExt(int nr, int method) @@ -1176,27 +1391,30 @@ void StopSoundExt(int nr, int method) if (!audio.sound_available) return; - if (SSND_FADING(method)) + if (method & SSND_FADING) snd_ctrl.fade_sound = TRUE; - if (SSND_ALL(method)) + if (method & SSND_ALL) snd_ctrl.stop_all_sounds = TRUE; else { - snd_ctrl.nr = nr; snd_ctrl.stop_sound = TRUE; + snd_ctrl.nr = nr; } + if (method & SSND_MUSIC) + snd_ctrl.music = TRUE; + #if defined(TARGET_SDL) - if (SSND_FADING(method)) + if (method & SSND_FADING) { int i; for (i=0; ifullpath) + 1; + unsigned long str_size2 = strlen(ti->basepath) + 1; + unsigned long str_size3 = strlen(ti->fullpath) + 1; +#endif if (!audio.sound_available) return; - for(i=0; ifullpath, + 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 +} + +void InitReloadSounds(char *set_name) +{ + InitReloadSoundsOrMusic(set_name, SND_RELOAD_SOUNDS); +} + +void InitReloadMusic(char *set_name) +{ + InitReloadSoundsOrMusic(set_name, SND_RELOAD_MUSIC); +} + +void FreeSound(SoundInfo *sound) +{ + if (sound == NULL) + return; + + if (sound->data_ptr) + { #if defined(TARGET_SDL) - free(Sound[i].mix_chunk); -#elif !defined(PLATFORM_MSDOS) - free(Sound[i].data_ptr); -#else - destroy_sample(Sound[i].sample_ptr); + Mix_FreeChunk(sound->data_ptr); +#elif defined(TARGET_ALLEGRO) + destroy_sample(sound->data_ptr); +#else /* PLATFORM_UNIX */ + free(sound->data_ptr); +#endif + } + + free(sound); +} + +void FreeMusic(MusicInfo *music) +{ + if (music == NULL) + return; + + if (music->data_ptr) + { +#if defined(TARGET_SDL) + if (music->type == MUS_TYPE_MOD) + Mix_FreeMusic(music->data_ptr); + else + Mix_FreeChunk(music->data_ptr); +#elif defined(TARGET_ALLEGRO) + destroy_sample(music->data_ptr); +#else /* PLATFORM_UNIX */ + free(music->data_ptr); #endif + } + + free(music); +} + +void FreeAllSounds() +{ + int i; + + if (Sound == NULL) + return; + + for(i=0; i