X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=2712fa4c92970aefb7a98a5da4cd7071c5b4fad3;hp=cd34b284473e3126a0191fc3074f7005793fd0e0;hb=a8816d6e5319f9ec26a45346b08250f61e95c011;hpb=c9433eab5c4317ed4f89164b386a7d33562e29be diff --git a/src/libgame/sound.c b/src/libgame/sound.c index cd34b284..2712fa4c 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2002 Artsoft Entertainment * +* (c) 1994-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -19,6 +19,7 @@ #include #include #include +#include #include "platform.h" @@ -52,12 +53,6 @@ #define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 2) #endif -#if !defined(PLATFORM_HPUX) -#define SND_BLOCKSIZE 4096 -#else -#define SND_BLOCKSIZE 32768 -#endif - #define SND_TYPE_NONE 0 #define SND_TYPE_WAV 1 @@ -66,6 +61,7 @@ #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" @@ -75,32 +71,28 @@ #define SAME_SOUND_NR(x,y) ((x).nr == (y).nr) #define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr) -#if 0 -struct SoundHeader_SUN -{ - unsigned long magic; - unsigned long hdr_size; - unsigned long data_size; - unsigned long encoding; - unsigned long sample_rate; - unsigned long channels; -}; +#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)) -struct SoundHeader_8SVX -{ - char magic_FORM[4]; - unsigned long chunk_size; - char magic_8SVX[4]; -}; -#endif #if defined(AUDIO_UNIX_NATIVE) struct SoundHeader_WAV { unsigned short compression_code; unsigned short num_channels; - unsigned long sample_rate; - unsigned long bytes_per_second; + unsigned int sample_rate; + unsigned int bytes_per_second; unsigned short block_align; unsigned short bits_per_sample; }; @@ -122,7 +114,8 @@ struct SampleInfo int type; int format; void *data_ptr; /* pointer to first sample (8 or 16 bit) */ - long data_len; /* number of samples, NOT number of bytes */ + 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; @@ -137,13 +130,14 @@ struct SoundControl int state; - unsigned long playing_starttime; - unsigned long playing_pos; + unsigned int playing_starttime; + unsigned int playing_pos; int type; int format; void *data_ptr; /* pointer to first sample (8 or 16 bit) */ - long data_len; /* number of samples, NOT number of bytes */ + int data_len; /* number of samples, NOT number of bytes */ + int num_channels; /* mono: 1 channel, stereo: 2 channels */ #if defined(TARGET_ALLEGRO) int voice; @@ -151,26 +145,12 @@ struct SoundControl }; typedef struct SoundControl SoundControl; -struct ListNode -{ - char *key; - void *content; - struct ListNode *next; -}; -typedef struct ListNode ListNode; - -static ListNode *newListNode(void); -static void addNodeToList(ListNode **, char *, void *); -static void deleteNodeFromList(ListNode **, char *, void (*function)(void *)); -static ListNode *getNodeFromKey(ListNode *, char *); -static int getNumNodes(ListNode *); +static struct ArtworkListInfo *sound_info = NULL; +static struct ArtworkListInfo *music_info = NULL; +static MusicInfo **Music_NoConf = NULL; -static struct SoundEffectInfo *sound_effect; -static ListNode *SoundFileList = NULL; -static SoundInfo **Sound = NULL; -static MusicInfo **Music = NULL; -static int num_sounds = 0, num_music = 0; +static int num_music_noconf = 0; static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; @@ -193,6 +173,11 @@ static int ulaw_to_linear(unsigned char); static void ReloadCustomSounds(); static void ReloadCustomMusic(); static void FreeSound(void *); +static void FreeMusic(void *); +static void FreeAllMusic_NoConf(); + +static SoundInfo *getSoundInfoEntryFromSoundID(int); +static MusicInfo *getMusicInfoEntryFromMusicID(int); /* ------------------------------------------------------------------------- */ @@ -234,13 +219,14 @@ static boolean TestAudioDevices(void) static char *audio_device_name[] = { DEVICENAME_DSP, + DEVICENAME_SOUND_DSP, DEVICENAME_AUDIO }; int audio_device_fd = -1; int i; /* look for available audio devices, starting with preferred ones */ - for (i=0; i= 0) break; @@ -271,7 +257,10 @@ static boolean ForkAudioProcess(void) return FALSE; } - if (IS_CHILD_PROCESS(audio.mixer_pid)) + if (audio.mixer_pid == 0) /* we are the child process */ + audio.mixer_pid = getpid(); + + if (IS_CHILD_PROCESS()) Mixer_Main(); /* this function never returns */ else close(audio.mixer_pipe[0]); /* no reading from pipe needed */ @@ -302,7 +291,7 @@ void UnixCloseAudio(void) if (audio.device_fd) close(audio.device_fd); - if (IS_PARENT_PROCESS(audio.mixer_pid)) + if (IS_PARENT_PROCESS() && HAS_CHILD_PROCESS()) kill(audio.mixer_pid, SIGTERM); } @@ -317,7 +306,7 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) /* "ioctl()" expects pointer to 'int' value for stereo flag (boolean is defined as 'char', which will not work here) */ unsigned int fragment_spec = 0; - int fragment_size_query; + int fragment_size_query = -1; int stereo = TRUE; struct { @@ -350,7 +339,7 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) 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"); + "cannot set fragment size of audio device -- no sounds"); i = 0; afmt->format = 0; @@ -366,7 +355,7 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) if (afmt->format == 0) /* no supported audio format found */ Error(ERR_EXIT_SOUND_SERVER, - "cannot set audio format of /dev/dsp -- no sounds"); + "cannot set audio format of audio device -- no sounds"); /* try if we can use stereo sound */ afmt->stereo = TRUE; @@ -375,15 +364,15 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0) Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/dsp -- no sounds"); + "cannot set sample rate of audio device -- 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"); + "cannot get fragment size of audio device -- no sounds"); if (fragment_size_query != afmt->fragment_size) Error(ERR_EXIT_SOUND_SERVER, - "cannot set fragment size of /dev/dsp -- no sounds"); + "cannot set fragment size of audio device -- no sounds"); } #endif /* AUDIO_LINUX_IOCTL */ @@ -397,8 +386,8 @@ static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) 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; + a_info.play.sample_rate = afmt->sample_rate; + a_info.blocksize = afmt->fragment_size; afmt->format = AUDIO_FORMAT_U8; afmt->stereo = TRUE; @@ -412,7 +401,7 @@ static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/audio -- no sounds"); + "cannot set sample rate of audio device -- no sounds"); } } #endif /* PLATFORM_NETBSD */ @@ -425,7 +414,7 @@ static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) 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 audio device -- no sounds"); if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds"); @@ -469,7 +458,7 @@ static void InitAudioDevice(struct AudioFormatInfo *afmt) static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl) { - if (IS_CHILD_PROCESS(audio.mixer_pid)) + if (IS_CHILD_PROCESS()) return; if (write(audio.mixer_pipe[1], snd_ctrl, sizeof(SoundControl)) < 0) @@ -482,7 +471,7 @@ static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl) static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl) { - if (IS_PARENT_PROCESS(audio.mixer_pid)) + if (IS_PARENT_PROCESS()) return; if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(SoundControl)) @@ -490,31 +479,35 @@ static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl) Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); } -static void WriteReloadInfoToPipe(char *set_name, int type) +static void WriteReloadInfoToPipe(char *set_identifier, int type) { SoundControl snd_ctrl; TreeInfo *ti = (type == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current : artwork.mus_current); - unsigned long str_size1 = strlen(leveldir_current->fullpath) + 1; - unsigned long str_size2 = strlen(ti->basepath) + 1; - unsigned long str_size3 = strlen(ti->fullpath) + 1; + unsigned int str_size1 = strlen(leveldir_current->fullpath) + 1; + unsigned int str_size2 = strlen(leveldir_current->sounds_path) + 1; + unsigned int str_size3 = strlen(leveldir_current->music_path) + 1; + unsigned int str_size4 = strlen(ti->basepath) + 1; + unsigned int str_size5 = strlen(ti->fullpath) + 1; boolean override_level_artwork = (type == SND_CTRL_RELOAD_SOUNDS ? - setup.override_level_sounds : - setup.override_level_music); + gfx.override_level_sounds : + gfx.override_level_music); - if (IS_CHILD_PROCESS(audio.mixer_pid)) + if (IS_CHILD_PROCESS()) return; if (leveldir_current == NULL) /* should never happen */ Error(ERR_EXIT, "leveldir_current == NULL"); + clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */ + snd_ctrl.active = FALSE; snd_ctrl.state = type; - snd_ctrl.data_len = strlen(set_name) + 1; + snd_ctrl.data_len = strlen(set_identifier) + 1; if (write(audio.mixer_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0 || - write(audio.mixer_pipe[1], set_name, + write(audio.mixer_pipe[1], set_identifier, snd_ctrl.data_len) < 0 || write(audio.mixer_pipe[1], &override_level_artwork, sizeof(boolean)) < 0 || @@ -523,17 +516,25 @@ static void WriteReloadInfoToPipe(char *set_name, int type) write(audio.mixer_pipe[1], ti, sizeof(TreeInfo)) < 0 || write(audio.mixer_pipe[1], &str_size1, - sizeof(unsigned long)) < 0 || + sizeof(unsigned int)) < 0 || write(audio.mixer_pipe[1], &str_size2, - sizeof(unsigned long)) < 0 || + sizeof(unsigned int)) < 0 || write(audio.mixer_pipe[1], &str_size3, - sizeof(unsigned long)) < 0 || + sizeof(unsigned int)) < 0 || + write(audio.mixer_pipe[1], &str_size4, + sizeof(unsigned int)) < 0 || + write(audio.mixer_pipe[1], &str_size5, + sizeof(unsigned int)) < 0 || write(audio.mixer_pipe[1], leveldir_current->fullpath, str_size1) < 0 || - write(audio.mixer_pipe[1], ti->basepath, + write(audio.mixer_pipe[1], leveldir_current->sounds_path, str_size2) < 0 || + write(audio.mixer_pipe[1], leveldir_current->music_path, + str_size3) < 0 || + write(audio.mixer_pipe[1], ti->basepath, + str_size4) < 0 || write(audio.mixer_pipe[1], ti->fullpath, - str_size3) < 0) + str_size5) < 0) { Error(ERR_WARN, "cannot pipe to child process -- no sounds"); audio.sound_available = audio.sound_enabled = FALSE; @@ -546,29 +547,29 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) TreeInfo **ti_ptr = ((snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) ? &artwork.snd_current : &artwork.mus_current); TreeInfo *ti = *ti_ptr; - unsigned long str_size1, str_size2, str_size3; - static char *set_name = NULL; + unsigned int str_size1, str_size2, str_size3, str_size4, str_size5; + static char *set_identifier = NULL; boolean *override_level_artwork = (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS ? - &setup.override_level_sounds : - &setup.override_level_music); + &gfx.override_level_sounds : + &gfx.override_level_music); - if (set_name) - free(set_name); + checked_free(set_identifier); - set_name = checked_malloc(snd_ctrl->data_len); + set_identifier = checked_malloc(snd_ctrl->data_len); if (leveldir_current == NULL) leveldir_current = checked_calloc(sizeof(TreeInfo)); + if (ti == NULL) ti = *ti_ptr = checked_calloc(sizeof(TreeInfo)); - if (leveldir_current->fullpath != NULL) - free(leveldir_current->fullpath); - if (ti->basepath != NULL) - free(ti->basepath); - if (ti->fullpath != NULL) - free(ti->fullpath); - - if (read(audio.mixer_pipe[0], set_name, + + checked_free(leveldir_current->fullpath); + checked_free(leveldir_current->sounds_path); + checked_free(leveldir_current->music_path); + checked_free(ti->basepath); + checked_free(ti->fullpath); + + if (read(audio.mixer_pipe[0], set_identifier, snd_ctrl->data_len) != snd_ctrl->data_len || read(audio.mixer_pipe[0], override_level_artwork, sizeof(boolean)) != sizeof(boolean) || @@ -577,29 +578,39 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) read(audio.mixer_pipe[0], ti, sizeof(TreeInfo)) != sizeof(TreeInfo) || read(audio.mixer_pipe[0], &str_size1, - sizeof(unsigned long)) != sizeof(unsigned long) || + sizeof(unsigned int)) != sizeof(unsigned int) || read(audio.mixer_pipe[0], &str_size2, - sizeof(unsigned long)) != sizeof(unsigned long) || + sizeof(unsigned int)) != sizeof(unsigned int) || read(audio.mixer_pipe[0], &str_size3, - sizeof(unsigned long)) != sizeof(unsigned long)) + sizeof(unsigned int)) != sizeof(unsigned int) || + read(audio.mixer_pipe[0], &str_size4, + sizeof(unsigned int)) != sizeof(unsigned int) || + read(audio.mixer_pipe[0], &str_size5, + sizeof(unsigned int)) != sizeof(unsigned int)) 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); + leveldir_current->sounds_path = checked_calloc(str_size2); + leveldir_current->music_path = checked_calloc(str_size3); + ti->basepath = checked_calloc(str_size4); + ti->fullpath = checked_calloc(str_size5); if (read(audio.mixer_pipe[0], leveldir_current->fullpath, str_size1) != str_size1 || - read(audio.mixer_pipe[0], ti->basepath, + read(audio.mixer_pipe[0], leveldir_current->sounds_path, str_size2) != str_size2 || + read(audio.mixer_pipe[0], leveldir_current->music_path, + str_size3) != str_size3 || + read(audio.mixer_pipe[0], ti->basepath, + str_size4) != str_size4 || read(audio.mixer_pipe[0], ti->fullpath, - str_size3) != str_size3) + str_size5) != str_size5) Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); if (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) - artwork.sounds_set_current_name = set_name; + artwork.snd_current_identifier = set_identifier; else - artwork.music_set_current_name = set_name; + artwork.mus_current_identifier = set_identifier; } #endif /* AUDIO_UNIX_NATIVE */ @@ -613,7 +624,7 @@ void Mixer_InitChannels() { int i; - for(i=0; i= num_music) /* invalid music */ + return; -#if 0 - printf("%d ACTIVE CHANNELS\n", mixer_active_channels); -#endif + if (snd_ctrl.nr < 0) /* undefined music */ + { + if (num_music_noconf == 0) /* no fallback music available */ + return; - if (IS_MUSIC(snd_ctrl)) + snd_ctrl.nr = UNMAP_NOCONF_MUSIC(snd_ctrl.nr) % num_music_noconf; + snd_info = Music_NoConf[snd_ctrl.nr]; + } + else + snd_info = getMusicInfoEntryFromMusicID(snd_ctrl.nr); + } + else { - if (num_music == 0) + if (snd_ctrl.nr < 0 || snd_ctrl.nr >= num_sounds) return; - snd_ctrl.nr = snd_ctrl.nr % num_music; + snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr); } - else if (snd_ctrl.nr >= num_sounds) - return; - snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]); if (snd_info == NULL) return; /* copy sound sample and format information */ - snd_ctrl.type = snd_info->type; - snd_ctrl.format = snd_info->format; - snd_ctrl.data_ptr = snd_info->data_ptr; - snd_ctrl.data_len = snd_info->data_len; + snd_ctrl.type = snd_info->type; + snd_ctrl.format = snd_info->format; + snd_ctrl.data_ptr = snd_info->data_ptr; + snd_ctrl.data_len = snd_info->data_len; + snd_ctrl.num_channels = snd_info->num_channels; /* play music samples on a dedicated music channel */ if (IS_MUSIC(snd_ctrl)) { -#if 0 - printf("PLAY MUSIC WITH VOLUME/STEREO %d/%d\n", - snd_ctrl.volume, snd_ctrl.stereo_position); -#endif + Mixer_StopMusicChannel(); mixer[audio.music_channel] = snd_ctrl; Mixer_PlayMusicChannel(); @@ -845,25 +861,17 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) } /* check if (and how often) this sound sample is already playing */ - for (k=0, i=audio.first_sound_channel; i 0 && IS_LOOP(snd_ctrl)) { - for(i=audio.first_sound_channel; i= 2) { - unsigned long playing_current = Counter(); + unsigned int playing_current = Counter(); int longest = 0, longest_nr = audio.first_sound_channel; /* look for oldest equal sound */ - for(i=audio.first_sound_channel; idata_len == 0) { printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n"); } #endif -#endif - -#if 1 - if (IS_MUSIC(snd_ctrl) && i == audio.music_channel && mixer[i].active) - { - printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n"); - -#if 1 - Mixer_StopChannel(i); -#endif - } -#endif mixer[i] = snd_ctrl; Mixer_PlayChannel(i); @@ -993,7 +995,7 @@ static void HandleSoundRequest(SoundControl snd_ctrl) int i; #if defined(AUDIO_UNIX_NATIVE) - if (IS_PARENT_PROCESS(audio.mixer_pid)) + if (IS_PARENT_PROCESS()) { SendSoundControlToMixerProcess(&snd_ctrl); return; @@ -1001,14 +1003,14 @@ static void HandleSoundRequest(SoundControl snd_ctrl) #endif /* deactivate channels that have expired since the last request */ - for (i=0; idata_ptr; - int i; + short *buffer_ptr = buffer_base_ptr + num_output_channels * buffer_pos; + int num_channels = snd_ctrl->num_channels; + int stepsize = num_channels; + int output_stepsize = num_output_channels; + int i, j; if (snd_ctrl->format == AUDIO_FORMAT_U8) - for (i=0; idata_ptr + num_channels * sample_pos; + + for (i = 0; i < num_output_channels; i++) + { + int offset = (snd_ctrl->num_channels == 1 ? 0 : i); + + for (j = 0; j < sample_size; j++) + buffer_ptr[output_stepsize * j + i] = + ((short)(sample_ptr[stepsize * j + offset] ^ 0x80)) << 8; + } + } else /* AUDIO_FORMAT_S16 */ - for (i=0; idata_ptr + num_channels * sample_pos; + + for (i = 0; i < num_output_channels; i++) + { + int offset = (snd_ctrl->num_channels == 1 ? 0 : i); + + for (j = 0; j < sample_size; j++) + buffer_ptr[output_stepsize * j + i] = + sample_ptr[stepsize * j + offset]; + } + } } #if defined(AUDIO_STREAMING_DSP) static void Mixer_Main_DSP() { - static short premix_first_buffer[SND_BLOCKSIZE]; - static short premix_left_buffer[SND_BLOCKSIZE]; - static short premix_right_buffer[SND_BLOCKSIZE]; - static long premix_last_buffer[SND_BLOCKSIZE]; - static byte playing_buffer[SND_BLOCKSIZE]; + static short premix_first_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE]; + static int premix_last_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE]; + static byte playing_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE]; boolean stereo; int fragment_size; int sample_bytes; int max_sample_size; + int num_output_channels; int i, j; if (!mixer_active_channels) @@ -1136,15 +1159,16 @@ static void Mixer_Main_DSP() stereo = afmt.stereo; fragment_size = afmt.fragment_size; sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2); - max_sample_size = fragment_size / ((stereo ? 2 : 1) * sample_bytes); + num_output_channels = (stereo ? 2 : 1); + max_sample_size = fragment_size / (num_output_channels * sample_bytes); /* first clear the last premixing buffer */ - memset(premix_last_buffer, 0, - max_sample_size * (stereo ? 2 : 1) * sizeof(long)); + clear_mem(premix_last_buffer, + max_sample_size * num_output_channels * sizeof(int)); - for(i=0; i= mixer[i].data_len) @@ -1238,7 +1253,7 @@ static void Mixer_Main_DSP() } /* prepare final playing buffer according to system audio format */ - for(i=0; i= mixer[i].data_len) Mixer_StopChannel(i); - for(i=0; i> 8) ^ 0x80; /* finally play the sound fragment */ @@ -1341,7 +1356,7 @@ void Mixer_Main() FD_ZERO(&mixer_fdset); FD_SET(audio.mixer_pipe[0], &mixer_fdset); - while(1) /* wait for sound playing commands from client */ + while (1) /* wait for sound playing commands from client */ { struct timeval delay = { 0, 0 }; @@ -1517,7 +1532,7 @@ static int ulaw_to_linear(unsigned char ulawbyte) #define CHUNK_ID_LEN 4 /* IFF style chunk id length */ #define WAV_HEADER_SIZE 16 /* size of WAV file header */ -static SoundInfo *Load_WAV(char *filename) +static void *Load_WAV(char *filename) { SoundInfo *snd_info; #if defined(AUDIO_UNIX_NATIVE) @@ -1528,16 +1543,13 @@ static SoundInfo *Load_WAV(char *filename) #endif char chunk_name[CHUNK_ID_LEN + 1]; int chunk_size; + int data_byte_len; FILE *file; #endif if (!audio.sound_available) return NULL; -#if 0 - printf("loading WAV file '%s'\n", filename); -#endif - snd_info = checked_calloc(sizeof(SoundInfo)); #if defined(TARGET_SDL) @@ -1564,6 +1576,8 @@ static SoundInfo *Load_WAV(char *filename) #else /* AUDIO_UNIX_NATIVE */ + clear_mem(&header, sizeof(struct SoundHeader_WAV)); /* to make gcc happy */ + if ((file = fopen(filename, MODE_READ)) == NULL) { Error(ERR_WARN, "cannot open sound file '%s'", filename); @@ -1573,7 +1587,7 @@ static SoundInfo *Load_WAV(char *filename) /* read chunk id "RIFF" */ getFileChunkLE(file, chunk_name, &chunk_size); - if (strcmp(chunk_name, "RIFF") != 0) + if (!strEqual(chunk_name, "RIFF")) { Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); fclose(file); @@ -1583,7 +1597,7 @@ static SoundInfo *Load_WAV(char *filename) /* read "RIFF" type id "WAVE" */ getFileChunkLE(file, chunk_name, NULL); - if (strcmp(chunk_name, "WAVE") != 0) + if (!strEqual(chunk_name, "WAVE")) { Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename); fclose(file); @@ -1593,7 +1607,7 @@ static SoundInfo *Load_WAV(char *filename) while (getFileChunkLE(file, chunk_name, &chunk_size)) { - if (strcmp(chunk_name, "fmt ") == 0) + if (strEqual(chunk_name, "fmt ")) { if (chunk_size < WAV_HEADER_SIZE) { @@ -1622,7 +1636,8 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } - if (header.num_channels != 1) + if (header.num_channels != 1 && + header.num_channels != 2) { Error(ERR_WARN, "sound file '%s': number of %d channels not supported", filename, header.num_channels); @@ -1631,7 +1646,8 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } - if (header.bits_per_sample != 8 && header.bits_per_sample != 16) + if (header.bits_per_sample != 8 && + header.bits_per_sample != 16) { Error(ERR_WARN, "sound file '%s': %d bits per sample not supported", filename, header.bits_per_sample); @@ -1649,15 +1665,17 @@ static SoundInfo *Load_WAV(char *filename) printf("WAV file: '%s'\n", filename); printf(" Compression code: %d'\n", header.compression_code); printf(" Number of channels: %d'\n", header.num_channels); - printf(" Sample rate: %ld'\n", header.sample_rate); - printf(" Average bytes per second: %ld'\n", header.bytes_per_second); + printf(" Sample rate: %d'\n", header.sample_rate); + printf(" Average bytes per second: %d'\n", header.bytes_per_second); printf(" Block align: %d'\n", header.block_align); printf(" Significant bits per sample: %d'\n", header.bits_per_sample); #endif } - else if (strcmp(chunk_name, "data") == 0) + else if (strEqual(chunk_name, "data")) { - snd_info->data_len = chunk_size; + data_byte_len = chunk_size; + + snd_info->data_len = data_byte_len; snd_info->data_ptr = checked_malloc(snd_info->data_len); /* read sound data */ @@ -1671,8 +1689,8 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } - /* check for odd number of sample bytes (data chunk is word aligned) */ - if ((chunk_size % 2) == 1) + /* check for odd number of data bytes (data chunk is word aligned) */ + if ((data_byte_len % 2) == 1) ReadUnusedBytesFromFile(file, 1); } else /* unknown chunk -- ignore */ @@ -1696,129 +1714,38 @@ static SoundInfo *Load_WAV(char *filename) snd_info->data_len /= 2; /* correct number of samples */ } -#endif /* AUDIO_UNIX_NATIVE */ - - snd_info->type = SND_TYPE_WAV; - snd_info->source_filename = getStringCopy(filename); - - return snd_info; -} - -static void deleteSoundEntry(SoundInfo **snd_info) -{ - if (*snd_info) - { - char *filename = (*snd_info)->source_filename; - -#if 0 - printf("[decrementing reference counter of sound '%s']\n", filename); -#endif - - if (--(*snd_info)->num_references <= 0) - { -#if 0 - printf("[deleting sound '%s']\n", filename); -#endif - - /* - FreeSound(*snd_info); - */ - deleteNodeFromList(&SoundFileList, filename, FreeSound); - } - - *snd_info = NULL; - } -} - -static void replaceSoundEntry(SoundInfo **snd_info, char *filename) -{ - ListNode *node; - - /* check if the old and the new sound file are the same */ - if (*snd_info && strcmp((*snd_info)->source_filename, filename) == 0) - { - /* The old and new sound are the same (have the same filename and path). - This usually means that this sound does not exist in this sound set - and a fallback to the existing sound is done. */ - -#if 0 - printf("[sound '%s' already exists (same list entry)]\n", filename); -#endif - - return; - } - - /* delete existing sound file entry */ - deleteSoundEntry(snd_info); + snd_info->num_channels = header.num_channels; + if (header.num_channels == 2) + snd_info->data_len /= 2; /* correct number of samples */ - /* check if the new sound file already exists in the list of sounds */ - if ((node = getNodeFromKey(SoundFileList, filename)) != NULL) - { #if 0 - printf("[sound '%s' already exists (other list entry)]\n", filename); -#endif - - *snd_info = (SoundInfo *)node->content; - (*snd_info)->num_references++; - } - else if ((*snd_info = Load_WAV(filename)) != NULL) /* load new sound */ + if (header.num_channels == 1) /* convert mono sound to stereo */ { - (*snd_info)->num_references = 1; - addNodeToList(&SoundFileList, (*snd_info)->source_filename, *snd_info); + void *buffer_ptr = checked_malloc(data_byte_len * 2); + void *sample_ptr = snd_info->data_ptr; + int sample_size = snd_info->data_len; + int i; + + if (snd_ctrl->format == AUDIO_FORMAT_U8) + for (i = 0; i < sample_size; i++) + *buffer_ptr++ = + ((short)(((byte *)sample_ptr)[i] ^ 0x80)) << 8; + else /* AUDIO_FORMAT_S16 */ + for (i = 0; i < sample_size; i++) + *buffer_ptr++ = + ((short *)sample_ptr)[i]; } -} - -static void LoadCustomSound(SoundInfo **snd_info, char *basename) -{ - char *filename = getCustomSoundFilename(basename); - -#if 0 - printf("GOT CUSTOM SOUND FILE '%s'\n", filename); #endif - if (strcmp(basename, SND_FILE_UNDEFINED) == 0) - { - deleteSoundEntry(snd_info); - return; - } - - if (filename == NULL) - { - Error(ERR_WARN, "cannot find sound file '%s'", basename); - return; - } - - replaceSoundEntry(snd_info, filename); -} - -void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries) -{ - if (Sound == NULL) - Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *)); - - sound_effect = sounds_list; - num_sounds = num_list_entries; -} - -void LoadSoundToList(char *basename, int list_pos) -{ - if (Sound == NULL || list_pos >= num_sounds) - return; - -#if 0 - printf("loading sound '%s' ... [%d]\n", - basename, getNumNodes(SoundFileList)); -#endif +#endif /* AUDIO_UNIX_NATIVE */ - LoadCustomSound(&Sound[list_pos], basename); + snd_info->type = SND_TYPE_WAV; + snd_info->source_filename = getStringCopy(filename); -#if 0 - printf("loading sound '%s' done [%d]\n", - basename, getNumNodes(SoundFileList)); -#endif + return snd_info; } -static MusicInfo *Load_MOD(char *filename) +static void *Load_MOD(char *filename) { #if defined(TARGET_SDL) MusicInfo *mod_info; @@ -1844,24 +1771,46 @@ static MusicInfo *Load_MOD(char *filename) #endif } -void LoadCustomMusic(void) +static void *Load_WAV_or_MOD(char *filename) +{ +#if 1 + if (FileIsMusic(filename)) + return Load_MOD(filename); + else if (FileIsSound(filename)) + return Load_WAV(filename); + else + return NULL; +#else + if (FileIsSound(filename)) + return Load_WAV(filename); + else if (FileIsMusic(filename)) + return Load_MOD(filename); + else + return NULL; +#endif +} + +void LoadCustomMusic_NoConf(void) { static boolean draw_init_text = TRUE; /* only draw at startup */ static char *last_music_directory = NULL; char *music_directory = getCustomMusicDirectory(); DIR *dir; struct dirent *dir_entry; + int num_music = getMusicListSize(); if (!audio.sound_available) return; if (last_music_directory != NULL && - strcmp(last_music_directory, music_directory) == 0) + strEqual(last_music_directory, music_directory)) return; /* old and new music directory are the same */ - last_music_directory = music_directory; + if (last_music_directory != NULL) + free(last_music_directory); + last_music_directory = getStringCopy(music_directory); - FreeAllMusic(); + FreeAllMusic_NoConf(); if ((dir = opendir(music_directory)) == NULL) { @@ -1871,39 +1820,275 @@ void LoadCustomMusic(void) } if (draw_init_text) - DrawInitText("Loading music:", 120, FC_GREEN); + DrawInitText("Loading music", 120, FC_GREEN); while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ { char *basename = dir_entry->d_name; - char *filename = getPath2(music_directory, basename); + char *filename = NULL; 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 (FileIsSound(basename)) - mus_info = Load_WAV(filename); - else if (FileIsMusic(basename)) - mus_info = Load_MOD(filename); + filename = getPath2(music_directory, basename); + + if (FileIsMusic(basename)) + mus_info = Load_WAV_or_MOD(filename); free(filename); if (mus_info) { - num_music++; - Music = checked_realloc(Music, num_music * sizeof(MusicInfo *)); - Music[num_music -1] = mus_info; + num_music_noconf++; + Music_NoConf = checked_realloc(Music_NoConf, + num_music_noconf * sizeof(MusicInfo *)); + Music_NoConf[num_music_noconf - 1] = mus_info; } } closedir(dir); draw_init_text = FALSE; +} + +int getSoundListSize() +{ + return (sound_info->num_file_list_entries + + sound_info->num_dynamic_file_list_entries); +} + +int getMusicListSize() +{ + return (music_info->num_file_list_entries + + music_info->num_dynamic_file_list_entries); +} + +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); + + return (pos < num_list_entries ? &sound_info->file_list[list_pos] : + &sound_info->dynamic_file_list[list_pos]); +} + +struct FileInfo *getMusicListEntry(int pos) +{ + int num_list_entries = music_info->num_file_list_entries; + int list_pos = (pos < num_list_entries ? pos : pos - num_list_entries); + + return (pos < num_list_entries ? &music_info->file_list[list_pos] : + &music_info->dynamic_file_list[list_pos]); +} + +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 snd_info[list_pos]; +} + +static MusicInfo *getMusicInfoEntryFromMusicID(int pos) +{ + 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 mus_info[list_pos]; +} + +int getSoundListPropertyMappingSize() +{ + return sound_info->num_property_mapping_entries; +} + +int getMusicListPropertyMappingSize() +{ + return music_info->num_property_mapping_entries; +} + +struct PropertyMapping *getSoundListPropertyMapping() +{ + return sound_info->property_mapping; +} + +struct PropertyMapping *getMusicListPropertyMapping() +{ + return music_info->property_mapping; +} + +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++; - if (num_music == 0) - Error(ERR_WARN, "cannot find any valid music files in directory '%s'", - music_directory); + 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; + + /* ---------- 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) +{ + int i; + + music_info = checked_calloc(sizeof(struct ArtworkListInfo)); + music_info->type = ARTWORK_TYPE_MUSIC; + + /* ---------- initialize file list and suffix lists ---------- */ + + music_info->num_file_list_entries = num_file_list_entries; + music_info->num_dynamic_file_list_entries = 0; + + music_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, ignore_tokens, + num_file_list_entries); + music_info->dynamic_file_list = NULL; + + music_info->num_suffix_list_entries = 0; + for (i = 0; config_suffix_list[i].token != NULL; i++) + music_info->num_suffix_list_entries++; + + music_info->suffix_list = config_suffix_list; + + /* ---------- initialize base prefix and suffixes lists ---------- */ + + music_info->num_base_prefixes = 0; + for (i = 0; base_prefixes[i] != NULL; i++) + music_info->num_base_prefixes++; + + music_info->num_ext1_suffixes = 0; + for (i = 0; ext1_suffixes[i] != NULL; i++) + music_info->num_ext1_suffixes++; + + music_info->num_ext2_suffixes = 0; + for (i = 0; ext2_suffixes[i] != NULL; i++) + music_info->num_ext2_suffixes++; + + music_info->num_ext3_suffixes = 0; + for (i = 0; ext3_suffixes[i] != NULL; i++) + music_info->num_ext3_suffixes++; + + music_info->num_ignore_tokens = 0; + for (i = 0; ignore_tokens[i] != NULL; i++) + music_info->num_ignore_tokens++; + + music_info->base_prefixes = base_prefixes; + music_info->ext1_suffixes = ext1_suffixes; + music_info->ext2_suffixes = ext2_suffixes; + music_info->ext3_suffixes = ext3_suffixes; + music_info->ignore_tokens = ignore_tokens; + + music_info->num_property_mapping_entries = 0; + + music_info->property_mapping = NULL; + + /* ---------- initialize artwork reference and content lists ---------- */ + + music_info->sizeof_artwork_list_entry = sizeof(MusicInfo *); + + music_info->artwork_list = + checked_calloc(num_file_list_entries * sizeof(MusicInfo *)); + music_info->dynamic_artwork_list = NULL; + + music_info->content_list = NULL; + + /* ---------- initialize artwork loading/freeing functions ---------- */ + + music_info->load_artwork = Load_WAV_or_MOD; + music_info->free_artwork = FreeMusic; } void PlayMusic(int nr) @@ -1943,6 +2128,8 @@ void PlaySoundExt(int nr, int volume, int stereo_position, int state) audio.sound_deactivated) return; + volume = SETUP_SOUND_VOLUME(volume, state); + if (volume < SOUND_MIN_VOLUME) volume = SOUND_MIN_VOLUME; else if (volume > SOUND_MAX_VOLUME) @@ -1953,6 +2140,8 @@ void PlaySoundExt(int nr, int volume, int stereo_position, int state) 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; @@ -1977,10 +2166,15 @@ void FadeSound(int nr) void FadeSounds() { - FadeMusic(); StopSoundExt(-1, SND_CTRL_FADE_ALL); } +void FadeSoundsAndMusic() +{ + FadeSounds(); + FadeMusic(); +} + void StopMusic(void) { if (!audio.music_available) @@ -2007,6 +2201,8 @@ void StopSoundExt(int nr, int state) if (!audio.sound_available) return; + clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */ + snd_ctrl.active = FALSE; snd_ctrl.nr = nr; snd_ctrl.state = state; @@ -2014,192 +2210,50 @@ void StopSoundExt(int nr, int state) HandleSoundRequest(snd_ctrl); } -ListNode *newListNode() -{ - return checked_calloc(sizeof(ListNode)); -} - -void addNodeToList(ListNode **node_first, char *key, void *content) -{ - ListNode *node_new = newListNode(); - -#if 0 - printf("LIST: adding node with key '%s'\n", key); -#endif - - node_new->key = getStringCopy(key); - node_new->content = content; - node_new->next = *node_first; - *node_first = node_new; -} - -void deleteNodeFromList(ListNode **node_first, char *key, - void (*destructor_function)(void *)) -{ - if (node_first == NULL || *node_first == NULL) - return; - -#if 0 - printf("[CHECKING LIST KEY '%s' == '%s']\n", - (*node_first)->key, key); -#endif - - if (strcmp((*node_first)->key, key) == 0) - { -#if 0 - printf("[DELETING LIST ENTRY]\n"); -#endif - - free((*node_first)->key); - if (destructor_function) - destructor_function((*node_first)->content); - *node_first = (*node_first)->next; - } - else - deleteNodeFromList(&(*node_first)->next, key, destructor_function); -} - -ListNode *getNodeFromKey(ListNode *node_first, char *key) -{ - if (node_first == NULL) - return NULL; - - if (strcmp(node_first->key, key) == 0) - return node_first; - else - return getNodeFromKey(node_first->next, key); -} - -int getNumNodes(ListNode *node_first) -{ - return (node_first ? 1 + getNumNodes(node_first->next) : 0); -} - -void dumpList(ListNode *node_first) -{ - ListNode *node = node_first; - - while (node) - { - printf("['%s' (%d)]\n", node->key, - ((SoundInfo *)node->content)->num_references); - node = node->next; - } - - printf("[%d nodes]\n", getNumNodes(node_first)); -} - -static void LoadSoundsInfo() -{ - char *filename = getCustomSoundConfigFilename(); - struct SetupFileList *setup_file_list; - int i; - -#if 0 - printf("GOT CUSTOM SOUND CONFIG FILE '%s'\n", filename); -#endif - - /* always start with reliable default values */ - for (i=0; i '%s'\n", sound_effect[i].filename); - else - printf("-> UNDEFINED [-> '%s']\n", sound_effect[i].default_filename); - } -#endif - } -} - static void ReloadCustomSounds() { - static boolean draw_init_text = TRUE; /* only draw at startup */ - int i; - -#if 0 - printf("DEBUG: reloading sounds '%s' ...\n",artwork.sounds_set_current_name); -#endif - - LoadSoundsInfo(); - - if (draw_init_text) - DrawInitText("Loading sounds:", 120, FC_GREEN); - #if 0 - printf("DEBUG: reloading %d sounds ...\n", num_sounds); + printf("::: reloading sounds '%s' ...\n", artwork.snd_current_identifier); #endif - for(i=0; isource_filename) - free(sound->source_filename); + checked_free(sound->source_filename); free(sound); } -void FreeMusic(MusicInfo *music) +void FreeMusic(void *ptr) { + MusicInfo *music = (MusicInfo *)ptr; + if (music == NULL) return; @@ -2251,49 +2306,31 @@ void FreeMusic(MusicInfo *music) free(music); } -void FreeAllSounds() +static void FreeAllMusic_NoConf() { int i; - if (Sound == NULL) + if (Music_NoConf == NULL) return; -#if 0 - printf("%s: FREEING SOUNDS ...\n", - IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT"); -#endif - - for(i=0; i