X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=9b0282bc6de704d38de2c9cffc894894accfd0bc;hb=3683bbbe90156d2a9ab32de08099e094a446e5f8;hp=00019c6e3e5cc12a1c10e4c3be03ef2c6e692bb2;hpb=1085cba858dc9cccaa5da434ddb990de23fffdfc;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 00019c6e..9b0282bc 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -11,69 +11,177 @@ * sound.c * ***********************************************************/ -#include +#include #include +#include #include #include #include #include +#include + +#include "platform.h" + +#if defined(PLATFORM_LINUX) +#include +#include +#elif defined(PLATFORM_FREEBSD) +#include +#elif defined(PLATFORM_NETBSD) +#include +#include +#elif defined(PLATFORM_HPUX) +#include +#endif #include "system.h" #include "sound.h" #include "misc.h" #include "setup.h" +#include "text.h" + + +/* expiration time (in milliseconds) for sound loops */ +#define SOUND_LOOP_EXPIRATION_TIME 200 + +/* one second fading interval == 1000 ticks (milliseconds) */ +#define SOUND_FADING_INTERVAL 1000 + +#if defined(AUDIO_STREAMING_DSP) +#define SOUND_FADING_VOLUME_STEP (SOUND_MAX_VOLUME / 40) +#define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 2) +#endif + +#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]) -struct ListNode +#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; +}; + +struct SoundHeader_8SVX +{ + char magic_FORM[4]; + unsigned long chunk_size; + char magic_8SVX[4]; +}; +#endif + +#if defined(AUDIO_UNIX_NATIVE) +struct SoundHeader_WAV { - char *key; - void *content; - struct ListNode *next; + unsigned short compression_code; + unsigned short num_channels; + unsigned long sample_rate; + unsigned long bytes_per_second; + unsigned short block_align; + unsigned short bits_per_sample; +}; +#endif + +struct AudioFormatInfo +{ + boolean stereo; /* availability of stereo sound */ + int format; /* size and endianess of sample data */ + int sample_rate; /* sample frequency */ + int fragment_size; /* audio device fragment size in bytes */ +}; + +struct SampleInfo +{ + char *source_filename; + int num_references; + + 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 num_channels; /* mono: 1 channel, stereo: 2 channels */ }; -typedef struct ListNode ListNode; +typedef struct SampleInfo SoundInfo; +typedef struct SampleInfo MusicInfo; -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 *); +struct SoundControl +{ + boolean active; + + int nr; + int volume; + int stereo_position; + + int state; + + unsigned long playing_starttime; + unsigned long 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 num_channels; /* mono: 1 channel, stereo: 2 channels */ -static struct SoundEffectInfo *sound_effect; -static ListNode *SoundFileList = NULL; +#if defined(TARGET_ALLEGRO) + int voice; +#endif +}; +typedef struct SoundControl SoundControl; + +static struct ArtworkListInfo *sound_info = NULL; static SoundInfo **Sound = NULL; static MusicInfo **Music = NULL; static int num_sounds = 0, num_music = 0; +static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; /* ========================================================================= */ /* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ -static struct AudioFormatInfo afmt; static struct SoundControl mixer[NUM_MIXER_CHANNELS]; static int mixer_active_channels = 0; -/* forward declaration of internal functions */ -static void Mixer_Main(void); -static void Mixer_InsertNewSound(struct SoundControl); -static void InitAudioDevice(struct AudioFormatInfo *); +#if defined(AUDIO_UNIX_NATIVE) +static struct AudioFormatInfo afmt; -#if defined(PLATFORM_UNIX) +static void Mixer_Main(void); #if !defined(AUDIO_STREAMING_DSP) static unsigned char linear_to_ulaw(int); static int ulaw_to_linear(unsigned char); #endif -#elif defined(PLATFORM_MSDOS) -static void Mixer_InsertNewSound(struct SoundControl); -static void Mixer_StopSound(struct SoundControl); -static void Mixer_StopAllSounds(); #endif static void ReloadCustomSounds(); static void ReloadCustomMusic(); static void FreeSound(void *); -#if defined(PLATFORM_UNIX) + +/* ------------------------------------------------------------------------- */ +/* functions for native (non-SDL) Unix audio/mixer support */ +/* ------------------------------------------------------------------------- */ + +#if defined(AUDIO_UNIX_NATIVE) + static int OpenAudioDevice(char *audio_device_name) { int audio_device_fd; @@ -107,6 +215,7 @@ static boolean TestAudioDevices(void) static char *audio_device_name[] = { DEVICENAME_DSP, + DEVICENAME_SOUND_DSP, DEVICENAME_AUDIO }; int audio_device_fd = -1; @@ -130,7 +239,6 @@ static boolean TestAudioDevices(void) return TRUE; } -#if !defined(TARGET_SDL) static boolean ForkAudioProcess(void) { if (pipe(audio.mixer_pipe) < 0) @@ -145,19 +253,19 @@ static boolean ForkAudioProcess(void) return FALSE; } - if (audio.mixer_pid == 0) /* we are child process */ - { - Mixer_Main(); +#if 0 + printf("PID: %d [%s]\n", getpid(), + (IS_CHILD_PROCESS(audio.mixer_pid) ? "child" : "parent")); + Delay(10000 * 0); +#endif - /* never reached */ - exit(0); - } - else /* we are parent */ - close(audio.mixer_pipe[0]); /* no reading from pipe needed */ + if (IS_CHILD_PROCESS(audio.mixer_pid)) + Mixer_Main(); /* this function never returns */ + else + close(audio.mixer_pipe[0]); /* no reading from pipe needed */ return TRUE; } -#endif void UnixOpenAudio(void) { @@ -182,20 +290,209 @@ void UnixCloseAudio(void) if (audio.device_fd) close(audio.device_fd); - if (audio.mixer_pid > 0) /* we are parent process */ + if (IS_PARENT_PROCESS(audio.mixer_pid)) kill(audio.mixer_pid, SIGTERM); } -static void WriteReloadInfoToPipe(char *set_name, int type) + +/* ------------------------------------------------------------------------- */ +/* functions for platform specific audio device initialization */ +/* ------------------------------------------------------------------------- */ + +#if defined(AUDIO_LINUX_IOCTL) +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 stereo = TRUE; + struct + { + int format_ioctl; + int format_result; + } + formats[] = + { + /* supported audio format in preferred order */ + { AFMT_S16_LE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_LE }, + { AFMT_S16_BE, AUDIO_FORMAT_S16 | AUDIO_FORMAT_BE }, + { AFMT_U8, AUDIO_FORMAT_U8 }, + { -1, -1 } + }; + int i; + + /* determine logarithm (log2) of the fragment size */ + while ((1 << fragment_spec) < afmt->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 audio device -- no sounds"); + + i = 0; + afmt->format = 0; + while (formats[i].format_result != -1) + { + unsigned int audio_format = formats[i].format_ioctl; + if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0) + { + afmt->format = formats[i].format_result; + break; + } + } + + if (afmt->format == 0) /* no supported audio format found */ + Error(ERR_EXIT_SOUND_SERVER, + "cannot set audio format of audio device -- no sounds"); + + /* try if we can use stereo sound */ + afmt->stereo = TRUE; + if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) + afmt->stereo = FALSE; + + if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set sample rate of 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 audio device -- no sounds"); + if (fragment_size_query != afmt->fragment_size) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set fragment size of audio device -- no sounds"); +} +#endif /* AUDIO_LINUX_IOCTL */ + +#if defined(PLATFORM_NETBSD) +static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) +{ + 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 = afmt->sample_rate; + a_info.blocksize = afmt->fragment_size; + + afmt->format = AUDIO_FORMAT_U8; + afmt->stereo = TRUE; + + if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + { + /* try to disable stereo */ + a_info.play.channels = 1; + + afmt->stereo = FALSE; + + if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set sample rate of audio device -- no sounds"); + } +} +#endif /* PLATFORM_NETBSD */ + +#if defined(PLATFORM_HPUX) +static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) +{ + 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 audio device -- no sounds"); + + if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) + 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"); + + ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); + ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); + + afmt->format = AUDIO_FORMAT_U8; + afmt->stereo = FALSE; + afmt->sample_rate = 8000; + + close(audio_ctl); +} +#endif /* PLATFORM_HPUX */ + +static void InitAudioDevice(struct AudioFormatInfo *afmt) +{ + afmt->stereo = TRUE; + afmt->format = AUDIO_FORMAT_UNKNOWN; + afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; + afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; + +#if defined(AUDIO_LINUX_IOCTL) + InitAudioDevice_Linux(afmt); +#elif defined(PLATFORM_NETBSD) + InitAudioDevice_NetBSD(afmt); +#elif defined(PLATFORM_HPUX) + InitAudioDevice_HPUX(afmt); +#else + /* generic /dev/audio stuff might be placed here */ +#endif +} + + +/* ------------------------------------------------------------------------- */ +/* functions for communication between main process and sound mixer process */ +/* ------------------------------------------------------------------------- */ + +static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl) +{ + if (IS_CHILD_PROCESS(audio.mixer_pid)) + return; + + if (write(audio.mixer_pipe[1], snd_ctrl, sizeof(SoundControl)) < 0) + { + Error(ERR_WARN, "cannot pipe to child process -- no sounds"); + audio.sound_available = audio.sound_enabled = FALSE; + return; + } +} + +static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl) +{ + if (IS_PARENT_PROCESS(audio.mixer_pid)) + return; + + if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(SoundControl)) + != sizeof(SoundControl)) + Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); +} + +static void WriteReloadInfoToPipe(char *set_identifier, int type) { - struct SoundControl snd_ctrl; + 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; - - if (audio.mixer_pid == 0) /* we are child process */ + unsigned long str_size2 = strlen(leveldir_current->sounds_path) + 1; + unsigned long str_size3 = strlen(leveldir_current->music_path) + 1; + unsigned long str_size4 = strlen(ti->basepath) + 1; + unsigned long str_size5 = strlen(ti->fullpath) + 1; + boolean override_level_artwork = (type == SND_CTRL_RELOAD_SOUNDS ? + setup.override_level_sounds : + setup.override_level_music); + + if (IS_CHILD_PROCESS(audio.mixer_pid)) return; if (leveldir_current == NULL) /* should never happen */ @@ -203,12 +500,14 @@ static void WriteReloadInfoToPipe(char *set_name, int type) 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 || write(audio.mixer_pipe[1], leveldir_current, sizeof(TreeInfo)) < 0 || write(audio.mixer_pipe[1], ti, @@ -219,12 +518,20 @@ static void WriteReloadInfoToPipe(char *set_name, int type) sizeof(unsigned long)) < 0 || write(audio.mixer_pipe[1], &str_size3, sizeof(unsigned long)) < 0 || + write(audio.mixer_pipe[1], &str_size4, + sizeof(unsigned long)) < 0 || + write(audio.mixer_pipe[1], &str_size5, + sizeof(unsigned long)) < 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; @@ -232,32 +539,42 @@ static void WriteReloadInfoToPipe(char *set_name, int type) } } -static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl) +static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) { - TreeInfo **ti_ptr = ((snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) ? + 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 long 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); - if (set_name) - free(set_name); + if (set_identifier) + 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 (leveldir_current->sounds_path != NULL) + free(leveldir_current->sounds_path); + if (leveldir_current->music_path != NULL) + free(leveldir_current->music_path); if (ti->basepath != NULL) free(ti->basepath); if (ti->fullpath != NULL) free(ti->fullpath); - if (read(audio.mixer_pipe[0], set_name, - snd_ctrl.data_len) != snd_ctrl.data_len || + 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) || read(audio.mixer_pipe[0], leveldir_current, sizeof(TreeInfo)) != sizeof(TreeInfo) || read(audio.mixer_pipe[0], ti, @@ -267,27 +584,43 @@ static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl) read(audio.mixer_pipe[0], &str_size2, sizeof(unsigned long)) != sizeof(unsigned long) || read(audio.mixer_pipe[0], &str_size3, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.mixer_pipe[0], &str_size4, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.mixer_pipe[0], &str_size5, 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); + 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 = set_name; + if (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) + artwork.snd_current_identifier = set_identifier; else - artwork.music_set_current = set_name; + artwork.mus_current_identifier = set_identifier; } -#endif /* PLATFORM_UNIX */ + +#endif /* AUDIO_UNIX_NATIVE */ + + +/* ------------------------------------------------------------------------- */ +/* mixer functions */ +/* ------------------------------------------------------------------------- */ void Mixer_InitChannels() { @@ -298,110 +631,260 @@ void Mixer_InitChannels() mixer_active_channels = 0; } -static void Mixer_FadeSound(int channel) +static void Mixer_ResetChannelExpiration(int channel) { - mixer[channel].state |= SND_CTRL_FADE; + mixer[channel].playing_starttime = Counter(); + +#if defined(TARGET_SDL) + if (IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel])) + Mix_ExpireChannel(channel, SOUND_LOOP_EXPIRATION_TIME); +#endif } -static void Mixer_RemoveSound(int channel) +static boolean Mixer_ChannelExpired(int channel) { - if (!mixer_active_channels || !mixer[channel].active) - return; + if (!mixer[channel].active) + return TRUE; -#if 0 - printf("REMOVING MIXER SOUND %d\n", channel); -#endif + if (IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) && + DelayReached(&mixer[channel].playing_starttime, + SOUND_LOOP_EXPIRATION_TIME)) + return TRUE; - mixer[channel].active = FALSE; - mixer_active_channels--; -} +#if defined(TARGET_SDL) -static void Mixer_InsertSound(struct SoundControl snd_ctrl) -{ - SoundInfo *snd_info; - int i, k; + if (!Mix_Playing(channel)) + return TRUE; -#if 0 - printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds); -#endif +#elif defined(TARGET_ALLEGRO) - if (IS_MUSIC(snd_ctrl)) - snd_ctrl.nr = snd_ctrl.nr % num_music; - else if (snd_ctrl.nr >= num_sounds) - return; + mixer[channel].playing_pos = voice_get_position(mixer[channel].voice); + mixer[channel].volume = voice_get_volume(mixer[channel].voice); - snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]); - if (snd_info == NULL) - { -#if 0 - printf("sound/music %d undefined\n", snd_ctrl.nr); + /* sound sample has completed playing or was completely faded out */ + if (mixer[channel].playing_pos == -1 || mixer[channel].volume == 0) + return TRUE; + +#endif /* TARGET_ALLEGRO */ + + return FALSE; +} + +static boolean Mixer_AllocateChannel(int channel) +{ +#if defined(TARGET_ALLEGRO) + mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr); + if (mixer[channel].voice < 0) + return FALSE; +#endif + + return TRUE; +} + +static void Mixer_SetChannelProperties(int channel) +{ +#if defined(TARGET_SDL) + Mix_Volume(channel, mixer[channel].volume); + Mix_SetPanning(channel, + SOUND_VOLUME_LEFT(mixer[channel].stereo_position), + SOUND_VOLUME_RIGHT(mixer[channel].stereo_position)); +#elif defined(TARGET_ALLEGRO) + voice_set_volume(mixer[channel].voice, mixer[channel].volume); + voice_set_pan(mixer[channel].voice, mixer[channel].stereo_position); #endif +} + +static void Mixer_StartChannel(int channel) +{ +#if defined(TARGET_SDL) + Mix_PlayChannel(channel, mixer[channel].data_ptr, + IS_LOOP(mixer[channel]) ? -1 : 0); +#elif defined(TARGET_ALLEGRO) + if (IS_LOOP(mixer[channel])) + voice_set_playmode(mixer[channel].voice, PLAYMODE_LOOP); + + voice_start(mixer[channel].voice); +#endif +} + +static void Mixer_PlayChannel(int channel) +{ + /* start with inactive channel in case something goes wrong */ + mixer[channel].active = FALSE; + + if (mixer[channel].type != MUS_TYPE_WAV) return; + + if (!Mixer_AllocateChannel(channel)) + return; + + Mixer_SetChannelProperties(channel); + Mixer_StartChannel(channel); + + Mixer_ResetChannelExpiration(channel); + + mixer[channel].playing_pos = 0; + mixer[channel].active = TRUE; + mixer_active_channels++; +} + +static void Mixer_PlayMusicChannel() +{ + Mixer_PlayChannel(audio.music_channel); + +#if defined(TARGET_SDL) + if (mixer[audio.music_channel].type != MUS_TYPE_WAV) + { + /* Mix_VolumeMusic() must be called _after_ Mix_PlayMusic() -- + this looks like a bug in the SDL_mixer library */ + Mix_PlayMusic(mixer[audio.music_channel].data_ptr, -1); + Mix_VolumeMusic(SOUND_MAX_VOLUME); } +#endif +} + +static void Mixer_StopChannel(int channel) +{ + if (!mixer[channel].active) + return; + +#if defined(TARGET_SDL) + Mix_HaltChannel(channel); +#elif defined(TARGET_ALLEGRO) + voice_set_volume(mixer[channel].voice, 0); + deallocate_voice(mixer[channel].voice); +#endif + + mixer[channel].active = FALSE; + mixer_active_channels--; +} + +static void Mixer_StopMusicChannel() +{ + Mixer_StopChannel(audio.music_channel); + +#if defined(TARGET_SDL) + Mix_HaltMusic(); +#endif +} + +static void Mixer_FadeChannel(int channel) +{ + if (!mixer[channel].active) + return; + + mixer[channel].state |= SND_CTRL_FADE; + +#if defined(TARGET_SDL) + Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL); +#elif defined(TARGET_ALLEGRO) + if (voice_check(mixer[channel].voice)) + voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, 0); +#endif +} + +static void Mixer_FadeMusicChannel() +{ + Mixer_FadeChannel(audio.music_channel); + +#if defined(TARGET_SDL) + Mix_FadeOutMusic(SOUND_FADING_INTERVAL); +#endif +} + +static void Mixer_UnFadeChannel(int channel) +{ + if (!mixer[channel].active || !IS_FADING(mixer[channel])) + return; + + mixer[channel].state &= ~SND_CTRL_FADE; + mixer[channel].volume = SOUND_MAX_VOLUME; + +#if defined(TARGET_SDL) + Mix_ExpireChannel(channel, -1); + Mix_Volume(channel, mixer[channel].volume); +#elif defined(TARGET_ALLEGRO) + voice_stop_volumeramp(mixer[channel].voice); + voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, + mixer[channel].volume); +#endif +} + +static void Mixer_InsertSound(SoundControl snd_ctrl) +{ + SoundInfo *snd_info; + int i, k; #if 0 - printf("-> %d\n", mixer_active_channels); + printf("NEW SOUND %d ARRIVED [%d] [%d ACTIVE CHANNELS]\n", + snd_ctrl.nr, num_sounds, mixer_active_channels); #endif - if (mixer_active_channels == audio.num_channels) + if (IS_MUSIC(snd_ctrl)) { - for (i=0; i= num_sounds) + return; - /* if mixer is full, remove oldest sound */ - if (mixer_active_channels == audio.num_channels) + 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.num_channels = snd_info->num_channels; + + /* play music samples on a dedicated music channel */ + if (IS_MUSIC(snd_ctrl)) { - int longest = 0, longest_nr = audio.first_sound_channel; + Mixer_StopMusicChannel(); - for (i=audio.first_sound_channel; i longest) - { - longest = actual; - longest_nr = i; - } - } -#if defined(PLATFORM_MSDOS) - voice_set_volume(mixer[longest_nr].voice, 0); - deallocate_voice(mixer[longest_nr].voice); -#endif - Mixer_RemoveSound(longest_nr); + return; } - /* check if sound is already being played (and how often) */ + /* check if (and how often) this sound sample is already playing */ for (k=0, i=audio.first_sound_channel; i= 1 && IS_LOOP(snd_ctrl)) +#if 0 + printf("SOUND %d [CURRENTLY PLAYING %d TIMES]\n", snd_ctrl.nr, k); +#endif + + /* reset expiration delay for already playing loop sounds */ + if (k > 0 && IS_LOOP(snd_ctrl)) { for(i=audio.first_sound_channel; i= 2) { + unsigned long playing_current = Counter(); int longest = 0, longest_nr = audio.first_sound_channel; /* look for oldest equal sound */ for(i=audio.first_sound_channel; i= longest) { longest = actual; @@ -434,83 +920,120 @@ static void Mixer_InsertSound(struct SoundControl snd_ctrl) } } -#if defined(PLATFORM_MSDOS) - voice_set_volume(mixer[longest_nr].voice, 0); - deallocate_voice(mixer[longest_nr].voice); -#endif - Mixer_RemoveSound(longest_nr); + Mixer_StopChannel(longest_nr); } - /* add new sound to mixer */ - for(i=0; idata_ptr; - snd_ctrl.data_len = snd_info->data_len; - snd_ctrl.format = snd_info->format; + Error(ERR_RETURN, "Mixer_InsertSound: %d [%d]: %ld (%ld)", + i, mixer[i].active, mixer[i].data_len, (long)mixer[i].data_ptr); + } +#endif +#endif - snd_ctrl.playingpos = 0; - snd_ctrl.playingtime = 0; + for (i=audio.first_sound_channel; idata_len == 0) + if (!IS_LOOP(mixer[i]) && actual > longest) { - printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n"); + longest = actual; + longest_nr = i; } -#endif + } -#if 1 - if (IS_MUSIC(snd_ctrl) && i == audio.music_channel && mixer[i].active) - { - printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n"); + Mixer_StopChannel(longest_nr); + } -#if 1 - Mixer_RemoveSound(i); -#endif - } + /* add the new sound to the mixer */ + for(i=audio.first_sound_channel; idata_len == 0) + { + printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n"); + } +#endif - if (snd_ctrl.loop) - voice_set_playmode(mixer[i].voice, PLAYMODE_LOOP); + mixer[i] = snd_ctrl; + Mixer_PlayChannel(i); - voice_set_volume(mixer[i].voice, snd_ctrl.volume); - voice_set_pan(mixer[i].voice, snd_ctrl.stereo); - voice_start(mixer[i].voice); -#endif break; } } } -static void HandleSoundRequest(struct SoundControl snd_ctrl) +static void HandleSoundRequest(SoundControl snd_ctrl) { int i; +#if defined(AUDIO_UNIX_NATIVE) + if (IS_PARENT_PROCESS(audio.mixer_pid)) + { + SendSoundControlToMixerProcess(&snd_ctrl); + return; + } +#endif + + /* deactivate channels that have expired since the last request */ + for (i=0; imajor, + link_version->minor, + link_version->patch); +#endif + if (!audio.sound_available) return; -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) + /* initialize stereo position conversion information */ + for(i=0; i<=SOUND_MAX_LEFT2RIGHT; i++) + stereo_volume[i] = + (int)sqrt((float)(SOUND_MAX_LEFT2RIGHT * SOUND_MAX_LEFT2RIGHT - i * i)); + +#if defined(AUDIO_UNIX_NATIVE) if (!ForkAudioProcess()) audio.sound_available = FALSE; #endif } -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) +#if defined(AUDIO_UNIX_NATIVE) -static void CopySampleToMixingBuffer(struct SoundControl *snd_ctrl, +static void CopySampleToMixingBuffer(SoundControl *snd_ctrl, int sample_pos, int sample_size, - short *buffer_ptr) + short *buffer_base_ptr, int buffer_pos, + int num_output_channels) { - void *sample_ptr = snd_ctrl->data_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; inum_channels == 1 ? 0 : i); + + for (j=0; jdata_ptr + num_channels * sample_pos; + + for (i=0; inum_channels == 1 ? 0 : i); + + for (j=0; j> PSND_MAX_VOLUME_BITS; + mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME; - /* fill the last mixing buffer with stereo or mono sound */ + /* adjust left and right channel volume due to stereo sound position */ if (stereo) { - int middle_pos = PSND_MAX_LEFT2RIGHT / 2; - int left_volume = stereo_volume[middle_pos + mixer[i].stereo]; - int right_volume= stereo_volume[middle_pos - mixer[i].stereo]; + int left_volume = SOUND_VOLUME_LEFT(mixer[i].stereo_position); + int right_volume = SOUND_VOLUME_RIGHT(mixer[i].stereo_position); for(j=0; j> PSND_MAX_LEFT2RIGHT_BITS; - premix_right_buffer[j] = - (right_volume * premix_first_buffer[j]) - >> PSND_MAX_LEFT2RIGHT_BITS; - - premix_last_buffer[2 * j + 0] += premix_left_buffer[j]; - premix_last_buffer[2 * j + 1] += premix_right_buffer[j]; + premix_first_buffer[2 * j + 0] = + left_volume * premix_first_buffer[2 * j + 0] / SOUND_MAX_LEFT2RIGHT; + premix_first_buffer[2 * j + 1] = + right_volume * premix_first_buffer[2 * j + 1] / SOUND_MAX_LEFT2RIGHT; } } - else - { - for(j=0; j= mixer[i].data_len) + if (mixer[i].playing_pos >= mixer[i].data_len) { if (IS_LOOP(mixer[i])) - mixer[i].playingpos = 0; + mixer[i].playing_pos = 0; else - Mixer_RemoveSound(i); + Mixer_StopChannel(i); } else if (mixer[i].volume <= SOUND_FADING_VOLUME_THRESHOLD) - Mixer_RemoveSound(i); + Mixer_StopChannel(i); } /* prepare final playing buffer according to system audio format */ - for(i=0; i> PSND_MAX_VOLUME_BITS; + mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME; /* might be needed for u-law /dev/audio */ -#if 0 +#if 1 for(j=0; j= mixer[i].data_len) - Mixer_RemoveSound(i); + if (mixer[i].playing_pos >= mixer[i].data_len) + Mixer_StopChannel(i); for(i=0; i> 8) ^ 0x80; @@ -815,7 +1360,7 @@ static int Mixer_Main_SimpleAudio(struct SoundControl snd_ctrl) void Mixer_Main() { - struct SoundControl snd_ctrl; + SoundControl snd_ctrl; fd_set mixer_fdset; close(audio.mixer_pipe[1]); /* no writing into pipe needed */ @@ -837,9 +1382,8 @@ void Mixer_Main() select(audio.mixer_pipe[0] + 1, &mixer_fdset, NULL, NULL, NULL); if (!FD_ISSET(audio.mixer_pipe[0], &mixer_fdset)) continue; - if (read(audio.mixer_pipe[0], &snd_ctrl, sizeof(snd_ctrl)) - != sizeof(snd_ctrl)) - Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); + + ReadSoundControlFromMainProcess(&snd_ctrl); HandleSoundRequest(snd_ctrl); @@ -878,311 +1422,20 @@ void Mixer_Main() delay.tv_sec = 0; delay.tv_usec = - ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000; - } - - CloseAudioDevice(&audio.device_fd); - - Mixer_InitChannels(); /* remove all sounds from mixer */ - -#endif /* !AUDIO_STREAMING_DSP */ - } -} -#endif /* PLATFORM_UNIX */ - -#if defined(PLATFORM_MSDOS) -static void sound_handler(struct SoundControl snd_ctrl) -{ - int i; - - if (snd_ctrl.fade_sound) - { - if (!mixer_active_channels) - return; - - for (i=0; ifragment_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"); - - i = 0; - afmt->format = 0; - while (formats[i].format_result != -1) - { - unsigned int audio_format = formats[i].format_ioctl; - if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0) - { - afmt->format = formats[i].format_result; - break; - } - } - - if (afmt->format == 0) /* no supported audio format found */ - Error(ERR_EXIT_SOUND_SERVER, - "cannot set audio format of /dev/dsp -- no sounds"); - - /* try if we can use stereo sound */ - afmt->stereo = TRUE; - if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) - afmt->stereo = FALSE; - - if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/dsp -- no sounds"); - - /* get the real fragmentation size; this should return 512 */ - if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot get fragment size of /dev/dsp -- no sounds"); - if (fragment_size_query != afmt->fragment_size) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set fragment size of /dev/dsp -- no sounds"); -} -#endif /* AUDIO_LINUX_IOCTL */ - -#if defined(PLATFORM_NETBSD) -static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) -{ - 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; - - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = TRUE; - - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - { - /* try to disable stereo */ - a_info.play.channels = 1; - - afmt->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"); - } -} -#endif /* PLATFORM_NETBSD */ - -#if defined(PLATFORM_HPUX) -static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) -{ - struct audio_describe ainfo; - int audio_ctl; - - audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); - if (audio_ctl == -1) - Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); - - if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - 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"); - - ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); - ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); - - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = FALSE; - afmt->sample_rate = 8000; - - close(audio_ctl); -} -#endif /* PLATFORM_HPUX */ - -#if defined(PLATFORM_UNIX) -static void InitAudioDevice(struct AudioFormatInfo *afmt) -{ - afmt->stereo = TRUE; - afmt->format = AUDIO_FORMAT_UNKNOWN; - afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; - afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; + ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000; + } -#if defined(AUDIO_LINUX_IOCTL) - InitAudioDevice_Linux(afmt); -#elif defined(PLATFORM_NETBSD) - InitAudioDevice_NetBSD(afmt); -#elif defined(PLATFORM_HPUX) - InitAudioDevice_HPUX(afmt); -#else - /* generic /dev/audio stuff might be placed here */ -#endif + CloseAudioDevice(&audio.device_fd); + + Mixer_InitChannels(); /* remove all sounds from mixer */ + +#endif /* !AUDIO_STREAMING_DSP */ + } } -#endif /* PLATFORM_UNIX */ +#endif /* AUDIO_UNIX_NATIVE */ + -#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP) +#if defined(AUDIO_UNIX_NATIVE) && !defined(AUDIO_STREAMING_DSP) /* these two are stolen from "sox"... :) */ @@ -1287,7 +1540,7 @@ static int ulaw_to_linear(unsigned char ulawbyte) return(sample); } -#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */ +#endif /* AUDIO_UNIX_NATIVE && !AUDIO_STREAMING_DSP */ /* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ @@ -1297,15 +1550,19 @@ 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(TARGET_SDL) && !defined(PLATFORM_MSDOS) +#if defined(AUDIO_UNIX_NATIVE) + struct SoundHeader_WAV header; +#if 0 byte sound_header_buffer[WAV_HEADER_SIZE]; + int i; +#endif char chunk_name[CHUNK_ID_LEN + 1]; int chunk_size; + int data_byte_len; FILE *file; - int i; #endif if (!audio.sound_available) @@ -1326,6 +1583,8 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } + snd_info->data_len = ((Mix_Chunk *)snd_info->data_ptr)->alen; + #elif defined(TARGET_ALLEGRO) if ((snd_info->data_ptr = load_sample(filename)) == NULL) @@ -1335,7 +1594,9 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } -#else /* PLATFORM_UNIX */ + snd_info->data_len = ((SAMPLE *)snd_info->data_ptr)->len; + +#else /* AUDIO_UNIX_NATIVE */ if ((file = fopen(filename, MODE_READ)) == NULL) { @@ -1345,7 +1606,7 @@ static SoundInfo *Load_WAV(char *filename) } /* read chunk id "RIFF" */ - getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN); + getFileChunkLE(file, chunk_name, &chunk_size); if (strcmp(chunk_name, "RIFF") != 0) { Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); @@ -1355,7 +1616,7 @@ static SoundInfo *Load_WAV(char *filename) } /* read "RIFF" type id "WAVE" */ - getFileChunk(file, chunk_name, NULL, BYTE_ORDER_LITTLE_ENDIAN); + getFileChunkLE(file, chunk_name, NULL); if (strcmp(chunk_name, "WAVE") != 0) { Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename); @@ -1364,20 +1625,77 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } - while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN)) + while (getFileChunkLE(file, chunk_name, &chunk_size)) { if (strcmp(chunk_name, "fmt ") == 0) { - /* read header information */ - for (i=0; i < MIN(chunk_size, WAV_HEADER_SIZE); i++) - sound_header_buffer[i] = fgetc(file); + if (chunk_size < WAV_HEADER_SIZE) + { + Error(ERR_WARN, "sound file '%s': chunk 'fmt ' too short", filename); + fclose(file); + free(snd_info); + return NULL; + } + + header.compression_code = getFile16BitLE(file); + header.num_channels = getFile16BitLE(file); + header.sample_rate = getFile32BitLE(file); + header.bytes_per_second = getFile32BitLE(file); + header.block_align = getFile16BitLE(file); + header.bits_per_sample = getFile16BitLE(file); if (chunk_size > WAV_HEADER_SIZE) ReadUnusedBytesFromFile(file, chunk_size - WAV_HEADER_SIZE); + + if (header.compression_code != 1) + { + Error(ERR_WARN, "sound file '%s': compression code %d not supported", + filename, header.compression_code); + fclose(file); + free(snd_info); + return NULL; + } + + 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); + fclose(file); + free(snd_info); + return NULL; + } + + 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); + fclose(file); + free(snd_info); + return NULL; + } + + /* warn, but accept wrong sample rate (may be only slightly different) */ + if (header.sample_rate != DEFAULT_AUDIO_SAMPLE_RATE) + Error(ERR_WARN, "sound file '%s': wrong sample rate %d instead of %d", + filename, header.sample_rate, DEFAULT_AUDIO_SAMPLE_RATE); + +#if 0 + 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(" 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) { - 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 */ @@ -1391,8 +1709,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 */ @@ -1408,9 +1726,38 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } - snd_info->format = AUDIO_FORMAT_U8; + if (header.bits_per_sample == 8) + snd_info->format = AUDIO_FORMAT_U8; + else /* header.bits_per_sample == 16 */ + { + snd_info->format = AUDIO_FORMAT_S16; + snd_info->data_len /= 2; /* correct number of samples */ + } + + snd_info->num_channels = header.num_channels; + if (header.num_channels == 2) + snd_info->data_len /= 2; /* correct number of samples */ -#endif /* PLATFORM_UNIX */ +#if 0 + if (header.num_channels == 1) /* convert mono sound to stereo */ + { + 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; itype = SND_TYPE_WAV; snd_info->source_filename = getStringCopy(filename); @@ -1418,114 +1765,73 @@ static SoundInfo *Load_WAV(char *filename) return snd_info; } -static void deleteSoundEntry(SoundInfo **snd_info) +struct FileInfo *getCurrentSoundList() { - 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; - } + return sound_info->file_list; } -static void replaceSoundEntry(SoundInfo **snd_info, char *filename) +void InitSoundList(struct ConfigInfo *config_list, int num_file_list_entries, + struct ConfigInfo *config_suffix_list, + char **base_prefixes, + char **ext1_suffixes, + char **ext2_suffixes) { - ListNode *node; + int i; - /* check if the old and the new sound file are the same */ - if (*snd_info && strcmp((*snd_info)->source_filename, filename) == 0) - { - /* The old and new sound are the same (have the same filename and path). - This usually means that this sound does not exist in this sound set - and a fallback to the existing sound is done. */ + sound_info = checked_calloc(sizeof(struct ArtworkListInfo)); + sound_info->type = ARTWORK_TYPE_SOUNDS; -#if 0 - printf("[sound '%s' already exists (same list entry)]\n", filename); -#endif + /* ---------- initialize file list and suffix lists ---------- */ - return; - } + sound_info->num_file_list_entries = num_file_list_entries; + sound_info->num_dynamic_file_list_entries = 0; - /* delete existing sound file entry */ - deleteSoundEntry(snd_info); + sound_info->num_suffix_list_entries = 0; + for (i=0; config_suffix_list[i].token != NULL; i++) + sound_info->num_suffix_list_entries++; - /* check if the new sound file already exists in the list of sounds */ - if ((node = getNodeFromKey(SoundFileList, filename)) != NULL) - { -#if 0 - printf("[sound '%s' already exists (other list entry)]\n", filename); -#endif + sound_info->file_list = + getFileListFromConfigList(config_list, config_suffix_list, + num_file_list_entries); + sound_info->dynamic_file_list = NULL; - *snd_info = (SoundInfo *)node->content; - (*snd_info)->num_references++; - } - else if ((*snd_info = Load_WAV(filename)) != NULL) /* load new sound */ - { - (*snd_info)->num_references = 1; - addNodeToList(&SoundFileList, (*snd_info)->source_filename, *snd_info); - } -} + sound_info->suffix_list = config_suffix_list; -static void LoadCustomSound(SoundInfo **snd_info, char *basename) -{ - char *filename = getCustomSoundFilename(basename); + /* ---------- initialize base prefix and suffixes lists ---------- */ - if (strcmp(basename, SND_FILE_UNDEFINED) == 0) - { - deleteSoundEntry(snd_info); - return; - } + sound_info->num_base_prefixes = 0; + for (i=0; base_prefixes[i] != NULL; i++) + sound_info->num_base_prefixes++; - if (filename == NULL) - { - Error(ERR_WARN, "cannot find sound file '%s'", basename); - return; - } + sound_info->num_ext1_suffixes = 0; + for (i=0; ext1_suffixes[i] != NULL; i++) + sound_info->num_ext1_suffixes++; - replaceSoundEntry(snd_info, filename); -} + sound_info->num_ext2_suffixes = 0; + for (i=0; ext2_suffixes[i] != NULL; i++) + sound_info->num_ext2_suffixes++; -void InitSoundList(struct SoundEffectInfo *sounds_list, int num_list_entries) -{ - if (Sound == NULL) - Sound = checked_calloc(num_list_entries * sizeof(SoundInfo *)); + sound_info->base_prefixes = base_prefixes; + sound_info->ext1_suffixes = ext1_suffixes; + sound_info->ext2_suffixes = ext2_suffixes; - sound_effect = sounds_list; - num_sounds = num_list_entries; -} + /* ---------- initialize artwork reference and content lists ---------- */ -void LoadSoundToList(char *basename, int list_pos) -{ - if (Sound == NULL || list_pos >= num_sounds) - return; + sound_info->sizeof_artwork_list_entry = sizeof(SoundInfo *); -#if 0 - printf("loading sound '%s' ... [%d]\n", - basename, getNumNodes(SoundFileList)); -#endif + sound_info->artwork_list = + checked_calloc(num_file_list_entries * sizeof(SoundInfo *)); + sound_info->dynamic_artwork_list = NULL; - LoadCustomSound(&Sound[list_pos], basename); + sound_info->content_list = NULL; -#if 0 - printf("loading sound '%s' done [%d]\n", - basename, getNumNodes(SoundFileList)); -#endif + /* ---------- initialize artwork loading/freeing functions ---------- */ + + sound_info->load_artwork = Load_WAV; + sound_info->free_artwork = FreeSound; + + num_sounds = sound_info->num_file_list_entries; + Sound = (SoundInfo **)sound_info->artwork_list; } static MusicInfo *Load_MOD(char *filename) @@ -1556,6 +1862,8 @@ static MusicInfo *Load_MOD(char *filename) void LoadCustomMusic(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; @@ -1563,6 +1871,16 @@ void LoadCustomMusic(void) if (!audio.sound_available) return; + if (last_music_directory != NULL && + strcmp(last_music_directory, music_directory) == 0) + return; /* old and new music directory are the same */ + + if (last_music_directory != NULL) + free(last_music_directory); + last_music_directory = getStringCopy(music_directory); + + FreeAllMusic(); + if ((dir = opendir(music_directory)) == NULL) { Error(ERR_WARN, "cannot read music directory '%s'", music_directory); @@ -1570,12 +1888,22 @@ void LoadCustomMusic(void) return; } + if (draw_init_text) + 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); MusicInfo *mus_info = NULL; +#if 0 + printf("DEBUG: loading music '%s' ...\n", basename); +#endif + + if (draw_init_text) + DrawInitText(basename, 150, FC_YELLOW); + if (FileIsSound(basename)) mus_info = Load_WAV(filename); else if (FileIsMusic(basename)) @@ -1587,12 +1915,14 @@ void LoadCustomMusic(void) { num_music++; Music = checked_realloc(Music, num_music * sizeof(MusicInfo *)); - Music[num_music -1] = mus_info; + Music[num_music - 1] = mus_info; } } closedir(dir); + draw_init_text = FALSE; + if (num_music == 0) Error(ERR_WARN, "cannot find any valid music files in directory '%s'", music_directory); @@ -1603,105 +1933,63 @@ void PlayMusic(int nr) if (!audio.music_available) return; -#if defined(TARGET_SDL) - - nr = nr % num_music; - - if (Music[nr]->type == MUS_TYPE_MOD) - { - Mix_PlayMusic(Music[nr]->data_ptr, -1); - Mix_VolumeMusic(SOUND_MAX_VOLUME); /* must be _after_ Mix_PlayMusic()! */ - } - else /* play WAV music loop */ - { - Mix_Volume(audio.music_channel, SOUND_MAX_VOLUME); - Mix_PlayChannel(audio.music_channel, Music[nr]->data_ptr, -1); - } - -#else - PlaySoundMusic(nr); - -#endif } void PlaySound(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_SOUND); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_SOUND); } -void PlaySoundStereo(int nr, int stereo) +void PlaySoundStereo(int nr, int stereo_position) { - PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, SND_CTRL_PLAY_SOUND); + PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND); } void PlaySoundLoop(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_LOOP); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP); } void PlaySoundMusic(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC); } -void PlaySoundExt(int nr, int volume, int stereo, int state) +void PlaySoundExt(int nr, int volume, int stereo_position, int state) { - struct SoundControl snd_ctrl; + SoundControl snd_ctrl; if (!audio.sound_available || !audio.sound_enabled || audio.sound_deactivated) return; - if (volume < PSND_MIN_VOLUME) - volume = PSND_MIN_VOLUME; - else if (volume > PSND_MAX_VOLUME) - volume = PSND_MAX_VOLUME; + if (volume < SOUND_MIN_VOLUME) + volume = SOUND_MIN_VOLUME; + else if (volume > SOUND_MAX_VOLUME) + volume = SOUND_MAX_VOLUME; - if (stereo < PSND_MAX_LEFT) - stereo = PSND_MAX_LEFT; - else if (stereo > PSND_MAX_RIGHT) - stereo = PSND_MAX_RIGHT; + if (stereo_position < SOUND_MAX_LEFT) + stereo_position = SOUND_MAX_LEFT; + else if (stereo_position > SOUND_MAX_RIGHT) + stereo_position = SOUND_MAX_RIGHT; snd_ctrl.active = TRUE; - snd_ctrl.nr = nr; + snd_ctrl.nr = nr; snd_ctrl.volume = volume; - snd_ctrl.stereo = stereo; - snd_ctrl.state = state; + snd_ctrl.stereo_position = stereo_position; + snd_ctrl.state = state; -#if defined(TARGET_SDL) - if (Sound[nr]) - { - Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_PlayChannel(-1, Sound[nr]->data_ptr, (state & SND_CTRL_LOOP ? -1 : 0)); - } -#elif defined(PLATFORM_UNIX) - if (audio.mixer_pid == 0) /* we are child process */ - return; - - if (write(audio.mixer_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0) - { - Error(ERR_WARN, "cannot pipe to child process -- no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; - return; - } -#elif defined(PLATFORM_MSDOS) - sound_handler(snd_ctrl); -#endif + HandleSoundRequest(snd_ctrl); } void FadeMusic(void) { - if (!audio.sound_available) + if (!audio.music_available) return; -#if defined(TARGET_SDL) - Mix_FadeOutMusic(SOUND_FADING_INTERVAL); - Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); -#else StopSoundExt(-1, SND_CTRL_FADE_MUSIC); -#endif } void FadeSound(int nr) @@ -1717,15 +2005,10 @@ void FadeSounds() void StopMusic(void) { -#if defined(TARGET_SDL) - if (!audio.sound_available) + if (!audio.music_available) return; - Mix_HaltMusic(); - Mix_HaltChannel(audio.music_channel); -#else StopSoundExt(-1, SND_CTRL_STOP_MUSIC); -#endif } void StopSound(int nr) @@ -1741,230 +2024,59 @@ void StopSounds() void StopSoundExt(int nr, int state) { - struct SoundControl snd_ctrl; + SoundControl snd_ctrl; if (!audio.sound_available) return; snd_ctrl.active = FALSE; - snd_ctrl.nr = nr; - snd_ctrl.state = state; - -#if defined(TARGET_SDL) - - if (state & SND_CTRL_FADE) - { - int i; - - /* - for (i=audio.first_sound_channel; ikey = getStringCopy(key); - node_new->content = content; - node_new->next = *node_first; - *node_first = node_new; -} - -void deleteNodeFromList(ListNode **node_first, char *key, - void (*destructor_function)(void *)) -{ - if (node_first == NULL || *node_first == NULL) - return; - -#if 0 - printf("[CHECKING LIST KEY '%s' == '%s']\n", - (*node_first)->key, key); -#endif + snd_ctrl.nr = nr; + snd_ctrl.state = state; - 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; - - /* always start with reliable default values */ - for (i=0; i '%s'\n", sound_effect[i].filename); - else - printf("-> UNDEFINED [-> '%s']\n", sound_effect[i].default_filename); - } -#endif - } + HandleSoundRequest(snd_ctrl); } static void ReloadCustomSounds() { - int i; - -#if 0 - printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current); -#endif - - LoadSoundsInfo(); - #if 0 - printf("DEBUG: reloading %d sounds ...\n", num_sounds); + printf("DEBUG: reloading sounds '%s' ...\n", artwork.snd_current_identifier); #endif - for(i=0; idata_ptr); #elif defined(TARGET_ALLEGRO) destroy_sample(sound->data_ptr); -#else /* PLATFORM_UNIX */ +#else /* AUDIO_UNIX_NATIVE */ free(sound->data_ptr); #endif } @@ -2006,7 +2118,7 @@ void FreeMusic(MusicInfo *music) Mix_FreeChunk(music->data_ptr); #elif defined(TARGET_ALLEGRO) destroy_sample(music->data_ptr); -#else /* PLATFORM_UNIX */ +#else /* AUDIO_UNIX_NATIVE */ free(music->data_ptr); #endif } @@ -2016,27 +2128,7 @@ void FreeMusic(MusicInfo *music) void FreeAllSounds() { - int i; - - if (Sound == NULL) - return; - - printf("%s: FREEING SOUNDS ...\n", - audio.mixer_pid == 0 ? "CHILD" : "PARENT"); - - for(i=0; i