X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=2712fa4c92970aefb7a98a5da4cd7071c5b4fad3;hp=52fdcbfb7357d1d8d5964129fec64a35e13436dc;hb=a8816d6e5319f9ec26a45346b08250f61e95c011;hpb=f1685723f2d920b7d7349c57e902c7adfaffdb1c diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 52fdcbfb..2712fa4c 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-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -11,86 +11,207 @@ * sound.c * ***********************************************************/ -#include +#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" -static int num_sounds = 0, num_music = 0; -static struct SampleInfo *Sound = NULL; -#if defined(TARGET_SDL) -static int num_mods = 0; -static struct SampleInfo *Mod = NULL; +/* 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 -/* ========================================================================= */ -/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ +#define MUS_TYPE_NONE 0 +#define MUS_TYPE_WAV 1 +#define MUS_TYPE_MOD 2 + +#define DEVICENAME_DSP "/dev/dsp" +#define DEVICENAME_SOUND_DSP "/dev/sound/dsp" +#define DEVICENAME_AUDIO "/dev/audio" +#define DEVICENAME_AUDIOCTL "/dev/audioCtl" + +#define SOUND_VOLUME_LEFT(x) (stereo_volume[x]) +#define SOUND_VOLUME_RIGHT(x) (stereo_volume[SOUND_MAX_LEFT2RIGHT-x]) + +#define SAME_SOUND_NR(x,y) ((x).nr == (y).nr) +#define SAME_SOUND_DATA(x,y) ((x).data_ptr == (y).data_ptr) + +#define SOUND_VOLUME_FROM_PERCENT(v,p) ((p) < 0 ? SOUND_MIN_VOLUME : \ + (p) > 100 ? (v) : \ + (p) * (v) / 100) -static int playing_sounds = 0; -static struct SoundControl playlist[MAX_SOUNDS_PLAYING]; -static struct SoundControl emptySoundControl = +#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)) + + +#if defined(AUDIO_UNIX_NATIVE) +struct SoundHeader_WAV { - -1,0,0, FALSE,FALSE,FALSE,FALSE,FALSE,FALSE,FALSE, 0,0L,0L,NULL + unsigned short compression_code; + unsigned short num_channels; + unsigned int sample_rate; + unsigned int bytes_per_second; + unsigned short block_align; + unsigned short bits_per_sample; }; - -#if defined(PLATFORM_UNIX) -static int stereo_volume[PSND_MAX_LEFT2RIGHT+1]; -static char premix_first_buffer[SND_BLOCKSIZE]; -#if defined(AUDIO_STREAMING_DSP) -static char premix_left_buffer[SND_BLOCKSIZE]; -static char premix_right_buffer[SND_BLOCKSIZE]; -static int premix_last_buffer[SND_BLOCKSIZE]; #endif -static unsigned char playing_buffer[SND_BLOCKSIZE]; + +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) */ + 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; + +struct SoundControl +{ + boolean active; + + int nr; + int volume; + int stereo_position; + + int state; + + unsigned int playing_starttime; + unsigned int playing_pos; + + int type; + int format; + void *data_ptr; /* pointer to first sample (8 or 16 bit) */ + int data_len; /* number of samples, NOT number of bytes */ + int num_channels; /* mono: 1 channel, stereo: 2 channels */ + +#if defined(TARGET_ALLEGRO) + int voice; #endif +}; +typedef struct SoundControl SoundControl; -/* forward declaration of internal functions */ -#if defined(AUDIO_STREAMING_DSP) -static void SoundServer_InsertNewSound(struct SoundControl); -#elif defined(PLATFORM_UNIX) +static struct ArtworkListInfo *sound_info = NULL; +static struct ArtworkListInfo *music_info = NULL; + +static MusicInfo **Music_NoConf = NULL; + +static int num_music_noconf = 0; +static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; + + +/* ========================================================================= */ +/* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ + +static struct SoundControl mixer[NUM_MIXER_CHANNELS]; +static int mixer_active_channels = 0; + +#if defined(AUDIO_UNIX_NATIVE) +static struct AudioFormatInfo afmt; + +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 - -#if defined(AUDIO_LINUX_IOCTL) -static boolean InitAudioDevice_Linux(); -#elif defined(PLATFORM_NETBSD) -static boolean InitAudioDevice_NetBSD(); -#elif defined(PLATFORM_HPUX) -static boolean InitAudioDevice_HPUX(); -#elif defined(PLATFORM_MSDOS) -static void SoundServer_InsertNewSound(struct SoundControl); -static void SoundServer_StopSound(int); -static void SoundServer_StopAllSounds(); #endif -#if defined(PLATFORM_UNIX) +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); + + +/* ------------------------------------------------------------------------- */ +/* functions for native (non-SDL) Unix audio/mixer support */ +/* ------------------------------------------------------------------------- */ + +#if defined(AUDIO_UNIX_NATIVE) + static int OpenAudioDevice(char *audio_device_name) { - int audio_fd; + int audio_device_fd; /* check if desired audio device is accessible */ if (access(audio_device_name, W_OK) != 0) return -1; /* try to open audio device in non-blocking mode */ - if ((audio_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0) - return audio_fd; + if ((audio_device_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0) + return audio_device_fd; /* re-open audio device in blocking mode */ - close(audio_fd); - audio_fd = open(audio_device_name, O_WRONLY); + close(audio_device_fd); + audio_device_fd = open(audio_device_name, O_WRONLY); + + return audio_device_fd; +} - return audio_fd; +static void CloseAudioDevice(int *audio_device_fd) +{ + if (*audio_device_fd == 0) + return; + + close(*audio_device_fd); + *audio_device_fd = -1; } static boolean TestAudioDevices(void) @@ -98,57 +219,54 @@ static boolean TestAudioDevices(void) static char *audio_device_name[] = { DEVICENAME_DSP, + DEVICENAME_SOUND_DSP, DEVICENAME_AUDIO }; - int audio_fd = -1; + int audio_device_fd = -1; int i; /* look for available audio devices, starting with preferred ones */ - for (i=0; i= 0) + for (i = 0; i < sizeof(audio_device_name)/sizeof(char *); i++) + if ((audio_device_fd = OpenAudioDevice(audio_device_name[i])) >= 0) break; - if (audio_fd < 0) + if (audio_device_fd < 0) { Error(ERR_WARN, "cannot open audio device -- no sound"); return FALSE; } - close(audio_fd); + close(audio_device_fd); audio.device_name = audio_device_name[i]; return TRUE; } -#if !defined(TARGET_SDL) static boolean ForkAudioProcess(void) { - if (pipe(audio.soundserver_pipe) < 0) + if (pipe(audio.mixer_pipe) < 0) { Error(ERR_WARN, "cannot create pipe -- no sounds"); return FALSE; } - if ((audio.soundserver_pid = fork()) < 0) + if ((audio.mixer_pid = fork()) < 0) { Error(ERR_WARN, "cannot create sound server process -- no sounds"); return FALSE; } - if (audio.soundserver_pid == 0) /* we are child process */ - { - SoundServer(); + if (audio.mixer_pid == 0) /* we are the child process */ + audio.mixer_pid = getpid(); - /* never reached */ - exit(0); - } - else /* we are parent */ - close(audio.soundserver_pipe[0]); /* no reading from pipe needed */ + if (IS_CHILD_PROCESS()) + Mixer_Main(); /* this function never returns */ + else + close(audio.mixer_pipe[0]); /* no reading from pipe needed */ return TRUE; } -#endif void UnixOpenAudio(void) { @@ -162,6 +280,10 @@ void UnixOpenAudio(void) audio.music_available = TRUE; audio.loops_available = TRUE; #endif + + audio.num_channels = NUM_MIXER_CHANNELS; + audio.music_channel = MUSIC_CHANNEL; + audio.first_sound_channel = FIRST_SOUND_CHANNEL; } void UnixCloseAudio(void) @@ -169,653 +291,1133 @@ void UnixCloseAudio(void) if (audio.device_fd) close(audio.device_fd); - if (audio.soundserver_pid > 0) /* we are parent process */ - kill(audio.soundserver_pid, SIGTERM); + if (IS_PARENT_PROCESS() && HAS_CHILD_PROCESS()) + kill(audio.mixer_pid, SIGTERM); } -#endif /* PLATFORM_UNIX */ -void InitPlaylist(void) + +/* ------------------------------------------------------------------------- */ +/* 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 = -1; + 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; - 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 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 */ -void StartSoundserver(void) +#if defined(PLATFORM_NETBSD) +static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) { - if (!audio.sound_available) - return; + audio_info_t a_info; + boolean stereo = TRUE; -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) - if (!ForkAudioProcess()) - audio.sound_available = FALSE; + 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 } -#if defined(PLATFORM_UNIX) -void SoundServer(void) + +/* ------------------------------------------------------------------------- */ +/* functions for communication between main process and sound mixer process */ +/* ------------------------------------------------------------------------- */ + +static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl) +{ + if (IS_CHILD_PROCESS()) + 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()) + 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) +{ + SoundControl snd_ctrl; + TreeInfo *ti = (type == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current : + artwork.mus_current); + 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 ? + gfx.override_level_sounds : + gfx.override_level_music); + + 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_identifier) + 1; + + if (write(audio.mixer_pipe[1], &snd_ctrl, + sizeof(snd_ctrl)) < 0 || + 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, + sizeof(TreeInfo)) < 0 || + write(audio.mixer_pipe[1], &str_size1, + sizeof(unsigned int)) < 0 || + write(audio.mixer_pipe[1], &str_size2, + sizeof(unsigned int)) < 0 || + write(audio.mixer_pipe[1], &str_size3, + 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], 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_size5) < 0) + { + Error(ERR_WARN, "cannot pipe to child process -- no sounds"); + audio.sound_available = audio.sound_enabled = FALSE; + return; + } +} + +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 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 ? + &gfx.override_level_sounds : + &gfx.override_level_music); + + checked_free(set_identifier); + + 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)); + + 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) || + read(audio.mixer_pipe[0], leveldir_current, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.mixer_pipe[0], ti, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.mixer_pipe[0], &str_size1, + sizeof(unsigned int)) != sizeof(unsigned int) || + read(audio.mixer_pipe[0], &str_size2, + sizeof(unsigned int)) != sizeof(unsigned int) || + read(audio.mixer_pipe[0], &str_size3, + 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); + 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], 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_size5) != str_size5) + Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); + + if (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) + artwork.snd_current_identifier = set_identifier; + else + artwork.mus_current_identifier = set_identifier; +} + +#endif /* AUDIO_UNIX_NATIVE */ + + +/* ------------------------------------------------------------------------- */ +/* mixer functions */ +/* ------------------------------------------------------------------------- */ + +void Mixer_InitChannels() { int i; - struct SoundControl snd_ctrl; - fd_set sound_fdset; + for (i = 0; i < audio.num_channels; i++) + mixer[i].active = FALSE; + mixer_active_channels = 0; +} - close(audio.soundserver_pipe[1]); /* no writing into pipe needed */ +static void Mixer_ResetChannelExpiration(int channel) +{ + 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 +} - InitPlaylist(); +static boolean Mixer_ChannelExpired(int channel) +{ + if (!mixer[channel].active) + return TRUE; - stereo_volume[PSND_MAX_LEFT2RIGHT] = 0; - for(i=0;i= num_music) /* invalid music */ + return; + + if (snd_ctrl.nr < 0) /* undefined music */ { - for(i=0;i= num_sounds) + return; - if (snd_ctrl.reload_sounds) - ReloadSounds(); - else - ReloadMusic(); + snd_info = getSoundInfoEntryFromSoundID(snd_ctrl.nr); + } - continue; + 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)) + { + Mixer_StopMusicChannel(); + + mixer[audio.music_channel] = snd_ctrl; + Mixer_PlayMusicChannel(); + + return; + } + + /* check if (and how often) this sound sample is already playing */ + for (k = 0, i = audio.first_sound_channel; i < audio.num_channels; i++) + if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl)) + k++; + + /* reset expiration delay for already playing loop sounds */ + if (k > 0 && IS_LOOP(snd_ctrl)) + { + for (i = audio.first_sound_channel; i < audio.num_channels; i++) + { + if (mixer[i].active && SAME_SOUND_DATA(mixer[i], snd_ctrl)) + { + if (IS_FADING(mixer[i])) + Mixer_UnFadeChannel(i); + + /* restore settings like volume and stereo position */ + mixer[i].volume = snd_ctrl.volume; + mixer[i].stereo_position = snd_ctrl.stereo_position; + + Mixer_SetChannelProperties(i); + Mixer_ResetChannelExpiration(i); + } } -#if defined(AUDIO_STREAMING_DSP) + return; + } - if (snd_ctrl.fade_sound) + /* don't play sound more than n times simultaneously (with n == 2 for now) */ + if (k >= 2) + { + unsigned int playing_current = Counter(); + int longest = 0, longest_nr = audio.first_sound_channel; + + /* look for oldest equal sound */ + for (i = audio.first_sound_channel; i < audio.num_channels; i++) { - if (!playing_sounds) + int playing_time = playing_current - mixer[i].playing_starttime; + int actual; + + if (!mixer[i].active || !SAME_SOUND_NR(mixer[i], snd_ctrl)) continue; - for(i=0;i= longest) + { + longest = actual; + longest_nr = i; + } + } + + Mixer_StopChannel(longest_nr); + } + + /* If all (non-music) channels are active, stop the channel that has + played its sound sample most completely (in percent of the sample + length). As we cannot currently get the actual playing position + of the channel's sound sample when compiling with the SDL mixer + library, we use the current playing time (in milliseconds) instead. */ + +#if DEBUG + /* channel allocation sanity check -- should not be needed */ + if (mixer_active_channels == + audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1)) + { + for (i = audio.first_sound_channel; i < audio.num_channels; i++) { - if (!playing_sounds) - continue; - - for(i=0;i= 0) + int playing_time = playing_current - mixer[i].playing_starttime; + int actual = 1000 * playing_time / mixer[i].data_len; + + if (!IS_LOOP(mixer[i]) && actual > longest) { - if (!playing_sounds) /* we just opened the audio device */ - { -#if defined(AUDIO_LINUX_IOCTL) - stereo = InitAudioDevice_Linux(fragment_size, sample_rate); -#elif defined(PLATFORM_NETBSD) - stereo = InitAudioDevice_NetBSD(fragment_size, sample_rate); -#endif - max_sample_size = fragment_size / (stereo ? 2 : 1); - } - - if (snd_ctrl.active) /* new sound has arrived */ - SoundServer_InsertNewSound(snd_ctrl); - - while(playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - /* first clear the last premixing buffer */ - memset(premix_last_buffer, 0, fragment_size * sizeof(int)); - - for(i=0;i= SOUND_FADING_VOLUME_THRESHOLD) - playlist[i].volume -= SOUND_FADING_VOLUME_STEP; - - /* adjust volume of actual sound sample */ - if (playlist[i].volume != PSND_MAX_VOLUME) - for(j=0;j> PSND_MAX_VOLUME_BITS; - - /* fill the last mixing buffer with stereo or mono sound */ - if (stereo) - { - int middle_pos = PSND_MAX_LEFT2RIGHT/2; - int left_volume = stereo_volume[middle_pos+playlist[i].stereo]; - int right_volume = stereo_volume[middle_pos-playlist[i].stereo]; - - for(j=0;j> PSND_MAX_LEFT2RIGHT_BITS; - premix_right_buffer[j] = - (right_volume * (int)premix_first_buffer[j]) - >> PSND_MAX_LEFT2RIGHT_BITS; - premix_last_buffer[2*j+0] += premix_left_buffer[j]; - premix_last_buffer[2*j+1] += premix_right_buffer[j]; - } - } - else - { - for(j=0;j= playlist[i].data_len) - { - if (playlist[i].loop) - playlist[i].playingpos = 0; - else - { - playlist[i] = emptySoundControl; - playing_sounds--; - } - } - else if (playlist[i].volume <= SOUND_FADING_VOLUME_THRESHOLD) - { - playlist[i] = emptySoundControl; - playing_sounds--; - } - } - - /* put last mixing buffer to final playing buffer */ - for(i=0; i255) - playing_buffer[i] = 255; - else - playing_buffer[i] = (premix_last_buffer[i]>>1)^0x80; - } - - /* finally play the sound fragment */ - write(audio.device_fd, playing_buffer, fragment_size); - } - - /* if no sounds playing, free device for other sound programs */ - if (!playing_sounds) - close(audio.device_fd); + longest = actual; + longest_nr = i; } } -#else /* !AUDIO_STREAMING_DSP */ + Mixer_StopChannel(longest_nr); + } - if (snd_ctrl.active && !snd_ctrl.loop) + /* add the new sound to the mixer */ + for (i = audio.first_sound_channel; i < audio.num_channels; i++) + { + if (!mixer[i].active) { - struct timeval delay = { 0, 0 }; - byte *sample_ptr; - long sample_size, max_sample_size = SND_BLOCKSIZE; - long sample_rate = 8000; /* standard "/dev/audio" sampling rate */ - int wait_percent = 90; /* wait 90% of the real playing time */ - int i; - - if ((audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0) +#if defined(AUDIO_UNIX_NATIVE) + if (snd_info->data_len == 0) { - playing_sounds = 1; - - while(playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) - { - FD_SET(audio.soundserver_pipe[0], &sound_fdset); - - /* get pointer and size of the actual sound sample */ - sample_ptr = snd_ctrl.data_ptr + snd_ctrl.playingpos; - sample_size = - MIN(max_sample_size, snd_ctrl.data_len - snd_ctrl.playingpos); - snd_ctrl.playingpos += sample_size; - - /* fill the first mixing buffer with original sample */ - memcpy(premix_first_buffer,sample_ptr,sample_size); - - /* adjust volume of actual sound sample */ - if (snd_ctrl.volume != PSND_MAX_VOLUME) - for(i=0;i> PSND_MAX_VOLUME_BITS; - - for(i=0;i= snd_ctrl.data_len) - playing_sounds = 0; - - /* finally play the sound fragment */ - write(audio.device_fd,playing_buffer,sample_size); - - delay.tv_sec = 0; - delay.tv_usec = ((sample_size*10*wait_percent)/(sample_rate))*1000; - } - close(audio.device_fd); + printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n"); } +#endif + + mixer[i] = snd_ctrl; + Mixer_PlayChannel(i); + + break; } -#endif /* !AUDIO_STREAMING_DSP */ } } -#endif /* PLATFORM_UNIX */ -#if defined(PLATFORM_MSDOS) -static void sound_handler(struct SoundControl snd_ctrl) +static void HandleSoundRequest(SoundControl snd_ctrl) { int i; - if (snd_ctrl.fade_sound) +#if defined(AUDIO_UNIX_NATIVE) + if (IS_PARENT_PROCESS()) { - if (!playing_sounds) - return; - - for (i=0; imajor, + link_version->minor, + link_version->patch); +#endif + + if (!audio.sound_available) + return; + + /* 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 (snd_ctrl.active) - SoundServer_InsertNewSound(snd_ctrl); +#if defined(AUDIO_UNIX_NATIVE) + if (!ForkAudioProcess()) + audio.sound_available = FALSE; +#endif } -#endif /* PLATFORM_MSDOS */ -#if !defined(PLATFORM_WIN32) -static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl) +#if defined(AUDIO_UNIX_NATIVE) + +static void CopySampleToMixingBuffer(SoundControl *snd_ctrl, + int sample_pos, int sample_size, + short *buffer_base_ptr, int buffer_pos, + int num_output_channels) { - int i, k; + 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 playlist is full, remove oldest sound */ - if (playing_sounds==MAX_SOUNDS_PLAYING) + if (snd_ctrl->format == AUDIO_FORMAT_U8) { - int longest=0, longest_nr=0; + byte *sample_ptr = (byte *)snd_ctrl->data_ptr + num_channels * sample_pos; - for(i=0;inum_channels == 1 ? 0 : i); - if (!playlist[i].loop && actual>longest) - { - longest=actual; - longest_nr=i; - } + for (j = 0; j < sample_size; j++) + buffer_ptr[output_stepsize * j + i] = + ((short)(sample_ptr[stepsize * j + offset] ^ 0x80)) << 8; } -#if defined(PLATFORM_MSDOS) - voice_set_volume(playlist[longest_nr].voice, 0); - deallocate_voice(playlist[longest_nr].voice); -#endif - playlist[longest_nr] = emptySoundControl; - playing_sounds--; } - - /* check if sound is already being played (and how often) */ - for(k=0,i=0;idata_ptr + num_channels * sample_pos; - /* restart loop sounds only if they are just fading out */ - if (k>=1 && snd_ctrl.loop) - { - for(i=0;inum_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[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) return; + + if (audio.device_fd < 0) + { + if ((audio.device_fd = OpenAudioDevice(audio.device_name)) < 0) + return; + + InitAudioDevice(&afmt); } - /* don't play sound more than n times simultaneously (with n == 2 for now) */ - if (k>=2) + stereo = afmt.stereo; + fragment_size = afmt.fragment_size; + sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2); + num_output_channels = (stereo ? 2 : 1); + max_sample_size = fragment_size / (num_output_channels * sample_bytes); + + /* first clear the last premixing buffer */ + clear_mem(premix_last_buffer, + max_sample_size * num_output_channels * sizeof(int)); + + for (i = 0; i < audio.num_channels; i++) { - int longest=0, longest_nr=0; + // void *sample_ptr; + int sample_len; + int sample_pos; + int sample_size; - /* look for oldest equal sound */ - for(i=0;i=longest) + /* copy original sample to first mixing buffer */ + CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size, + premix_first_buffer, 0, num_output_channels); + + /* are we about to restart a looping sound? */ + if (IS_LOOP(mixer[i]) && sample_size < max_sample_size) + { + while (sample_size < max_sample_size) { - longest=actual; - longest_nr=i; - } - } + int restarted_sample_size = + MIN(max_sample_size - sample_size, sample_len); -#if defined(PLATFORM_MSDOS) - voice_set_volume(playlist[longest_nr].voice, 0); - deallocate_voice(playlist[longest_nr].voice); -#endif - playlist[longest_nr] = emptySoundControl; - playing_sounds--; - } + CopySampleToMixingBuffer(&mixer[i], 0, restarted_sample_size, + premix_first_buffer, sample_size, + num_output_channels); - /* neuen Sound in Liste packen */ - for(i=0;i= SOUND_FADING_VOLUME_THRESHOLD) + mixer[i].volume -= SOUND_FADING_VOLUME_STEP; - if (!playing_sounds) - return; + /* adjust volume of actual sound sample */ + if (mixer[i].volume != SOUND_MAX_VOLUME) + for (j = 0; j < sample_size * num_output_channels; j++) + premix_first_buffer[j] = + mixer[i].volume * (int)premix_first_buffer[j] / SOUND_MAX_VOLUME; - for(i=0;i= mixer[i].data_len) { -#if defined(PLATFORM_MSDOS) - voice_set_volume(playlist[i].voice, 0); - deallocate_voice(playlist[i].voice); -#endif - playlist[i] = emptySoundControl; - playing_sounds--; + if (IS_LOOP(mixer[i])) + mixer[i].playing_pos = 0; + else + Mixer_StopChannel(i); } + else if (mixer[i].volume <= SOUND_FADING_VOLUME_THRESHOLD) + Mixer_StopChannel(i); + } -#if !defined(PLATFORM_MSDOS) - if (!playing_sounds) - close(audio.device_fd); -#endif -} + /* prepare final playing buffer according to system audio format */ + for (i = 0; i < max_sample_size * num_output_channels; i++) + { + /* cut off at 17 bit value */ + if (premix_last_buffer[i] < -65535) + premix_last_buffer[i] = -65535; + else if (premix_last_buffer[i] > 65535) + premix_last_buffer[i] = 65535; -static void SoundServer_StopAllSounds() -{ - int i; + /* shift to 16 bit value */ + premix_last_buffer[i] >>= 1; - for(i=0;i> 8) ^ 0x80; + } + else if (afmt.format & AUDIO_FORMAT_LE) /* 16 bit */ + { + playing_buffer[2 * i + 0] = premix_last_buffer[i] & 0xff; + playing_buffer[2 * i + 1] = premix_last_buffer[i] >> 8; + } + else /* big endian */ + { + playing_buffer[2 * i + 0] = premix_last_buffer[i] >> 8; + playing_buffer[2 * i + 1] = premix_last_buffer[i] & 0xff; + } } - playing_sounds = 0; -#if !defined(PLATFORM_MSDOS) - close(audio.device_fd); -#endif + /* finally play the sound fragment */ + if (write(audio.device_fd, playing_buffer, fragment_size) == -1) + Error(ERR_WARN, "write() failed; %s", strerror(errno)); + + if (!mixer_active_channels) + CloseAudioDevice(&audio.device_fd); } -#endif /* PLATFORM_MSDOS */ -#endif /* !PLATFORM_WIN32 */ +#else /* !AUDIO_STREAMING_DSP */ -/* ------------------------------------------------------------------------- */ -/* platform dependant audio initialization code */ -/* ------------------------------------------------------------------------- */ +static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl) +{ + static short premix_first_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE]; + static byte playing_buffer[DEFAULT_AUDIO_FRAGMENT_SIZE]; + int max_sample_size = DEFAULT_AUDIO_FRAGMENT_SIZE; + int num_output_channels = 1; + void *sample_ptr; + int sample_len; + int sample_pos; + int sample_size; + int i, j; + + i = 1; + + /* pointer, lenght and actual playing position of sound sample */ + sample_ptr = mixer[i].data_ptr; + sample_len = mixer[i].data_len; + sample_pos = mixer[i].playing_pos; + sample_size = MIN(max_sample_size, sample_len - sample_pos); + mixer[i].playing_pos += sample_size; + + /* copy original sample to first mixing buffer */ + CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size, + premix_first_buffer, 0, num_output_channels); + + /* adjust volume of actual sound sample */ + if (mixer[i].volume != SOUND_MAX_VOLUME) + for (j = 0; j < sample_size; j++) + premix_first_buffer[j] = + mixer[i].volume * (int)premix_first_buffer[j] / SOUND_MAX_VOLUME; + + /* might be needed for u-law /dev/audio */ + for (j = 0; j < sample_size; j++) + playing_buffer[j] = + linear_to_ulaw(premix_first_buffer[j]); + + /* delete completed sound entries from the mixer */ + if (mixer[i].playing_pos >= mixer[i].data_len) + Mixer_StopChannel(i); + + for (i = 0; i < sample_size; i++) + playing_buffer[i] = (premix_first_buffer[i] >> 8) ^ 0x80; + + /* finally play the sound fragment */ + write(audio.device_fd, playing_buffer, sample_size); + + return sample_size; +} +#endif /* !AUDIO_STREAMING_DSP */ -#if defined(AUDIO_LINUX_IOCTL) -static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate) +void Mixer_Main() { - /* "ioctl()" expects pointer to 'int' value for stereo flag - (boolean is defined as 'char', which will not work here) */ - int stereo = TRUE; - unsigned long fragment_spec = 0; + SoundControl snd_ctrl; + fd_set mixer_fdset; - /* determine logarithm (log2) of the fragment size */ - for (fragment_spec=0; (1 << fragment_spec) < fragment_size; - fragment_spec++); + close(audio.mixer_pipe[1]); /* no writing into pipe needed */ - /* 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; + Mixer_InitChannels(); - /* 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 defined(PLATFORM_HPUX) + InitAudioDevice(&afmt); +#endif - 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"); + FD_ZERO(&mixer_fdset); + FD_SET(audio.mixer_pipe[0], &mixer_fdset); - /* try if we can use stereo sound */ - if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) + while (1) /* wait for sound playing commands from client */ { -#ifdef DEBUG - static boolean reported = FALSE; + struct timeval delay = { 0, 0 }; - if (!reported) - { - Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp"); - reported = TRUE; - } -#endif - stereo = FALSE; - } + FD_SET(audio.mixer_pipe[0], &mixer_fdset); + select(audio.mixer_pipe[0] + 1, &mixer_fdset, NULL, NULL, NULL); + if (!FD_ISSET(audio.mixer_pipe[0], &mixer_fdset)) + continue; - if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &sample_rate) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/dsp -- no sounds"); + ReadSoundControlFromMainProcess(&snd_ctrl); - /* get the real fragmentation size; this should return 512 */ - if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot get fragment size of /dev/dsp -- no sounds"); + HandleSoundRequest(snd_ctrl); - return (boolean)stereo; -} -#endif /* AUDIO_LINUX_IOCTL */ +#if defined(AUDIO_STREAMING_DSP) -#if defined(PLATFORM_NETBSD) -static boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate) -{ - audio_info_t a_info; - boolean stereo = TRUE; + while (mixer_active_channels && + select(audio.mixer_pipe[0] + 1, + &mixer_fdset, NULL, NULL, &delay) < 1) + { + FD_SET(audio.mixer_pipe[0], &mixer_fdset); - 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; + Mixer_Main_DSP(); + } - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - { - /* try to disable stereo */ - a_info.play.channels = 1; - stereo = FALSE; +#else /* !AUDIO_STREAMING_DSP */ - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/audio -- no sounds"); - } + if (!snd_ctrl.active || IS_LOOP(snd_ctrl) || + (audio.device_fd = OpenAudioDevice(audio.device_name)) < 0) + continue; - return stereo; -} -#endif /* PLATFORM_NETBSD */ + InitAudioDevice(&afmt); -#if defined(PLATFORM_HPUX) -static boolean InitAudioDevice_HPUX() -{ - struct audio_describe ainfo; - int audio_ctl; + delay.tv_sec = 0; + delay.tv_usec = 0; - audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); - if (audio_ctl == -1) - Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); + while (mixer_active_channels && + select(audio.mixer_pipe[0] + 1, + &mixer_fdset, NULL, NULL, &delay) < 1) + { + int wait_percent = 90; /* wait 90% of the real playing time */ + int sample_size; - if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds"); + FD_SET(audio.mixer_pipe[0], &mixer_fdset); - if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) - Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds"); + sample_size = Mixer_Main_SimpleAudio(snd_ctrl); - ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); - ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); + delay.tv_sec = 0; + delay.tv_usec = + ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000; + } - close(audio_ctl); + CloseAudioDevice(&audio.device_fd); - return TRUE; /* to provide common interface for InitAudioDevice_...() */ + Mixer_InitChannels(); /* remove all sounds from mixer */ + +#endif /* !AUDIO_STREAMING_DSP */ + } } -#endif /* PLATFORM_HPUX */ +#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"... :) */ @@ -920,100 +1522,160 @@ 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 */ /* ========================================================================= */ /* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS */ -void ReloadSounds() -{ - printf("reloading sounds ...\n"); -} - -void ReloadMusic() -{ - printf("reloading music ...\n"); -} - #define CHUNK_ID_LEN 4 /* IFF style chunk id length */ #define WAV_HEADER_SIZE 16 /* size of WAV file header */ -static boolean Load_WAV(char *filename) +static void *Load_WAV(char *filename) { - struct SampleInfo *snd_info; -#if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS) + SoundInfo *snd_info; +#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) - return FALSE; + return NULL; - num_sounds++; - Sound = checked_realloc(Sound, num_sounds * sizeof(struct SampleInfo)); - - snd_info = &Sound[num_sounds - 1]; - snd_info->data_len = 0; - snd_info->data_ptr = NULL; + snd_info = checked_calloc(sizeof(SoundInfo)); #if defined(TARGET_SDL) - if ((snd_info->mix_chunk = Mix_LoadWAV(filename)) == NULL) + if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL) { Error(ERR_WARN, "cannot read sound file '%s'", filename); - return FALSE; + free(snd_info); + return NULL; } -#elif defined(PLATFORM_UNIX) + snd_info->data_len = ((Mix_Chunk *)snd_info->data_ptr)->alen; + +#elif defined(TARGET_ALLEGRO) + + if ((snd_info->data_ptr = load_sample(filename)) == NULL) + { + Error(ERR_WARN, "cannot read sound file '%s'", filename); + free(snd_info); + return NULL; + } + + snd_info->data_len = ((SAMPLE *)snd_info->data_ptr)->len; + +#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); - return FALSE; + free(snd_info); + return NULL; } /* read chunk id "RIFF" */ - getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk_name, "RIFF") != 0) + getFileChunkLE(file, chunk_name, &chunk_size); + if (!strEqual(chunk_name, "RIFF")) { Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); fclose(file); - return FALSE; + free(snd_info); + return NULL; } /* read "RIFF" type id "WAVE" */ - getFileChunk(file, chunk_name, NULL, BYTE_ORDER_LITTLE_ENDIAN); - if (strcmp(chunk_name, "WAVE") != 0) + getFileChunkLE(file, chunk_name, NULL); + if (!strEqual(chunk_name, "WAVE")) { Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename); fclose(file); - return FALSE; + free(snd_info); + return NULL; } - while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN)) + while (getFileChunkLE(file, chunk_name, &chunk_size)) { -#if 0 - printf("DEBUG: file '%s', chunk id '%s', chunk size '%d' [%d]\n", - filename, chunk_name, chunk_size, feof(file)); -#endif + if (strEqual(chunk_name, "fmt ")) + { + if (chunk_size < WAV_HEADER_SIZE) + { + Error(ERR_WARN, "sound file '%s': chunk 'fmt ' too short", filename); + fclose(file); + free(snd_info); + return NULL; + } - 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); + 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: %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 */ @@ -1022,11 +1684,13 @@ static boolean Load_WAV(char *filename) { Error(ERR_WARN,"cannot read 'data' chunk of sound file '%s'",filename); fclose(file); - return FALSE; + free(snd_info->data_ptr); + free(snd_info); + return NULL; } - /* check for odd number of sample bytes (data chunk is word aligned) */ - if ((chunk_size % 2) == 1) + /* 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 */ @@ -1038,110 +1702,393 @@ static boolean Load_WAV(char *filename) if (snd_info->data_ptr == NULL) { Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename); - return FALSE; + free(snd_info); + return NULL; } - for (i=0; idata_len; i++) - snd_info->data_ptr[i] = snd_info->data_ptr[i] ^ 0x80; + 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 */ + } -#else /* PLATFORM_MSDOS */ + snd_info->num_channels = header.num_channels; + if (header.num_channels == 2) + snd_info->data_len /= 2; /* correct number of samples */ - snd_info->sample_ptr = load_sample(filename); - if (!snd_info->sample_ptr) +#if 0 + if (header.num_channels == 1) /* convert mono sound to stereo */ { - Error(ERR_WARN, "cannot read sound file '%s'", filename); - return FALSE; - } + 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]; + } #endif - return TRUE; -} - -boolean LoadCustomSound(char *basename) -{ - char *filename = getCustomSoundFilename(basename); +#endif /* AUDIO_UNIX_NATIVE */ - if (filename == NULL) - { - Error(ERR_WARN, "cannot find sound file '%s' -- no sounds", filename); - return FALSE; - } + snd_info->type = SND_TYPE_WAV; + snd_info->source_filename = getStringCopy(filename); - return Load_WAV(filename); + return snd_info; } -static boolean Load_MOD(char *mod_name) +static void *Load_MOD(char *filename) { #if defined(TARGET_SDL) - struct SampleInfo *mod_info; - char *filename; - - num_mods++; - Mod = checked_realloc(Mod, num_mods * sizeof(struct SampleInfo)); + MusicInfo *mod_info; - mod_info = &Mod[num_mods - 1]; - mod_info->name = mod_name; + if (!audio.sound_available) + return NULL; - filename = getPath2(options.music_directory, mod_info->name); + mod_info = checked_calloc(sizeof(MusicInfo)); - if ((mod_info->mix_music = Mix_LoadMUS(filename)) == NULL) + if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL) { - Error(ERR_WARN, "cannot read music file '%s' -- no music", filename); - free(filename); - return FALSE; + Error(ERR_WARN, "cannot read music file '%s'", filename); + free(mod_info); + return NULL; } - free(filename); + mod_info->type = MUS_TYPE_MOD; + mod_info->source_filename = getStringCopy(filename); - return TRUE; + return mod_info; #else - return FALSE; + return NULL; +#endif +} + +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 } -int LoadCustomMusic(void) +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_wav_music = 0; - int num_mod_music = 0; + int num_music = getMusicListSize(); if (!audio.sound_available) - return 0; + return; + + if (last_music_directory != NULL && + strEqual(last_music_directory, music_directory)) + return; /* old and new music directory are the same */ + + if (last_music_directory != NULL) + free(last_music_directory); + last_music_directory = getStringCopy(music_directory); + + FreeAllMusic_NoConf(); if ((dir = opendir(music_directory)) == NULL) { Error(ERR_WARN, "cannot read music directory '%s'", music_directory); audio.music_available = FALSE; - return 0; + return; } + if (draw_init_text) + DrawInitText("Loading music", 120, FC_GREEN); + while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ { - char *filename = getPath2(music_directory, dir_entry->d_name); + char *basename = dir_entry->d_name; + 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(filename) && Load_WAV(filename)) - num_wav_music++; - else if (FileIsMusic(filename) && Load_MOD(filename)) - num_mod_music++; + filename = getPath2(music_directory, basename); + + if (FileIsMusic(basename)) + mus_info = Load_WAV_or_MOD(filename); free(filename); + + if (mus_info) + { + num_music_noconf++; + Music_NoConf = checked_realloc(Music_NoConf, + num_music_noconf * sizeof(MusicInfo *)); + Music_NoConf[num_music_noconf - 1] = mus_info; + } } closedir(dir); - if (num_wav_music == 0 && num_mod_music == 0) - Error(ERR_WARN, "cannot find any valid music files in directory '%s'", - options.music_directory); + 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++; + + 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; - num_music = (num_mod_music > 0 ? num_mod_music : num_wav_music); + music_info->num_property_mapping_entries = 0; - audio.mods_available = (num_mod_music > 0); - audio.music_available = (num_music > 0); + music_info->property_mapping = NULL; - return num_music; + /* ---------- 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) @@ -1149,262 +2096,241 @@ void PlayMusic(int nr) if (!audio.music_available) return; - if (!audio.mods_available) - nr = num_sounds - num_music + nr; - -#if defined(TARGET_SDL) - if (audio.mods_available) /* play MOD music */ - { - Mix_PlayMusic(Mod[nr].mix_music, -1); - Mix_VolumeMusic(SOUND_MAX_VOLUME); /* must be _after_ Mix_PlayMusic()! */ - } - else /* play WAV music loop */ - { - Mix_Volume(audio.music_channel, SOUND_MAX_VOLUME); - Mix_PlayChannel(audio.music_channel, Sound[nr].mix_chunk, -1); - } -#else - audio.music_nr = nr; - PlaySoundLoop(nr); -#endif + PlaySoundMusic(nr); } void PlaySound(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_NO_LOOP); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_SOUND); } -void PlaySoundStereo(int nr, int stereo) +void PlaySoundStereo(int nr, int stereo_position) { - PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, PSND_NO_LOOP); + PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND); } void PlaySoundLoop(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, PSND_LOOP); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP); +} + +void PlaySoundMusic(int nr) +{ + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC); } -void PlaySoundExt(int nr, int volume, int stereo, boolean loop) +void PlaySoundExt(int nr, int volume, int stereo_position, int state) { - struct SoundControl snd_ctrl = emptySoundControl; + SoundControl snd_ctrl; if (!audio.sound_available || !audio.sound_enabled || audio.sound_deactivated) return; - if (volumePSND_MAX_VOLUME) - volume = PSND_MAX_VOLUME; + volume = SETUP_SOUND_VOLUME(volume, state); - if (stereoPSND_MAX_RIGHT) - stereo = PSND_MAX_RIGHT; + if (volume < SOUND_MIN_VOLUME) + volume = SOUND_MIN_VOLUME; + else if (volume > SOUND_MAX_VOLUME) + volume = SOUND_MAX_VOLUME; - snd_ctrl.nr = nr; - snd_ctrl.volume = volume; - snd_ctrl.stereo = stereo; - snd_ctrl.loop = loop; - snd_ctrl.active = TRUE; - snd_ctrl.data_ptr = Sound[nr].data_ptr; - snd_ctrl.data_len = Sound[nr].data_len; + if (stereo_position < SOUND_MAX_LEFT) + stereo_position = SOUND_MAX_LEFT; + else if (stereo_position > SOUND_MAX_RIGHT) + stereo_position = SOUND_MAX_RIGHT; -#if defined(TARGET_SDL) - Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_PlayChannel(-1, Sound[nr].mix_chunk, (loop ? -1 : 0)); -#elif defined(PLATFORM_UNIX) - if (audio.soundserver_pid == 0) /* we are child process */ - return; + clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */ - if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0) - { - Error(ERR_WARN, "cannot pipe to child process -- no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; - return; - } -#elif defined(PLATFORM_MSDOS) - sound_handler(snd_ctrl); -#endif + snd_ctrl.active = TRUE; + snd_ctrl.nr = nr; + snd_ctrl.volume = volume; + snd_ctrl.stereo_position = stereo_position; + snd_ctrl.state = state; + + HandleSoundRequest(snd_ctrl); } void FadeMusic(void) { -#if defined(TARGET_SDL) - if (!audio.sound_available) + if (!audio.music_available) return; - if (audio.mods_available) - Mix_FadeOutMusic(SOUND_FADING_INTERVAL); - else - Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); -#else - FadeSound(audio.music_nr); -#endif + StopSoundExt(-1, SND_CTRL_FADE_MUSIC); } void FadeSound(int nr) { - StopSoundExt(nr, SSND_FADE_SOUND); + StopSoundExt(nr, SND_CTRL_FADE_SOUND); } void FadeSounds() { + StopSoundExt(-1, SND_CTRL_FADE_ALL); +} + +void FadeSoundsAndMusic() +{ + FadeSounds(); FadeMusic(); - StopSoundExt(-1, SSND_FADE_ALL_SOUNDS); } void StopMusic(void) { -#if defined(TARGET_SDL) - if (!audio.sound_available) + if (!audio.music_available) return; - if (audio.mods_available) - Mix_HaltMusic(); - else - Mix_HaltChannel(audio.music_channel); -#else - StopSound(audio.music_nr); -#endif + StopSoundExt(-1, SND_CTRL_STOP_MUSIC); } void StopSound(int nr) { - StopSoundExt(nr, SSND_STOP_SOUND); + StopSoundExt(nr, SND_CTRL_STOP_SOUND); } void StopSounds() { - StopSoundExt(-1, SSND_STOP_ALL_SOUNDS); + StopMusic(); + StopSoundExt(-1, SND_CTRL_STOP_ALL); } -void StopSoundExt(int nr, int method) +void StopSoundExt(int nr, int state) { - struct SoundControl snd_ctrl = emptySoundControl; + SoundControl snd_ctrl; if (!audio.sound_available) return; - if (SSND_FADING(method)) - snd_ctrl.fade_sound = TRUE; + clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */ - if (SSND_ALL(method)) - snd_ctrl.stop_all_sounds = TRUE; - else - { - snd_ctrl.nr = nr; - snd_ctrl.stop_sound = TRUE; - } + snd_ctrl.active = FALSE; + snd_ctrl.nr = nr; + snd_ctrl.state = state; -#if defined(TARGET_SDL) + HandleSoundRequest(snd_ctrl); +} - if (SSND_FADING(method)) - { - int i; +static void ReloadCustomSounds() +{ +#if 0 + printf("::: reloading sounds '%s' ...\n", artwork.snd_current_identifier); +#endif - for (i=0; idata_ptr) + { #if defined(TARGET_SDL) - ReloadMusic(); -#elif defined(PLATFORM_UNIX) - if (audio.soundserver_pid == 0) /* we are child process */ + Mix_FreeChunk(sound->data_ptr); +#elif defined(TARGET_ALLEGRO) + destroy_sample(sound->data_ptr); +#else /* AUDIO_UNIX_NATIVE */ + free(sound->data_ptr); +#endif + } + + checked_free(sound->source_filename); + + free(sound); +} + +void FreeMusic(void *ptr) +{ + MusicInfo *music = (MusicInfo *)ptr; + + if (music == NULL) return; - if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0) + if (music->data_ptr) { - 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); +#if defined(TARGET_SDL) + if (music->type == MUS_TYPE_MOD) + Mix_FreeMusic(music->data_ptr); + else + Mix_FreeChunk(music->data_ptr); +#elif defined(TARGET_ALLEGRO) + destroy_sample(music->data_ptr); +#else /* AUDIO_UNIX_NATIVE */ + free(music->data_ptr); #endif + } + + free(music); } -void FreeSounds(int num_sounds) +static void FreeAllMusic_NoConf() { int i; - if (!audio.sound_available) + if (Music_NoConf == NULL) return; - for(i=0; i