X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=cb788e7e573769a7efeec3e8ff1fbeaec7692fc3;hp=2712fa4c92970aefb7a98a5da4cd7071c5b4fad3;hb=8d71e6fb8309bd90ce5f2900d84c686b17950492;hpb=a8816d6e5319f9ec26a45346b08250f61e95c011 diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 2712fa4c..cb788e7e 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* sound.c * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// sound.c +// ============================================================================ #include #include @@ -22,19 +20,6 @@ #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" @@ -48,11 +33,6 @@ /* 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 @@ -85,19 +65,6 @@ SOUND_VOLUME_LOOPS(v) : \ SOUND_VOLUME_SIMPLE(v)) - -#if defined(AUDIO_UNIX_NATIVE) -struct SoundHeader_WAV -{ - 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; -}; -#endif - struct AudioFormatInfo { boolean stereo; /* availability of stereo sound */ @@ -138,10 +105,6 @@ struct SoundControl 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; @@ -153,22 +116,15 @@ static MusicInfo **Music_NoConf = NULL; static int num_music_noconf = 0; static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; +static char *currently_playing_music_filename = NULL; + /* ========================================================================= */ /* 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 -#endif +static boolean expire_loop_sounds = FALSE; static void ReloadCustomSounds(); static void ReloadCustomMusic(); @@ -180,442 +136,6 @@ 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_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_device_fd = open(audio_device_name, O_WRONLY | O_NONBLOCK)) < 0) - return audio_device_fd; - - /* re-open audio device in blocking mode */ - close(audio_device_fd); - audio_device_fd = open(audio_device_name, O_WRONLY); - - return audio_device_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) -{ - static char *audio_device_name[] = - { - DEVICENAME_DSP, - DEVICENAME_SOUND_DSP, - DEVICENAME_AUDIO - }; - int audio_device_fd = -1; - int i; - - /* look for available audio devices, starting with preferred ones */ - for (i = 0; i < sizeof(audio_device_name)/sizeof(char *); i++) - if ((audio_device_fd = OpenAudioDevice(audio_device_name[i])) >= 0) - break; - - if (audio_device_fd < 0) - { - Error(ERR_WARN, "cannot open audio device -- no sound"); - return FALSE; - } - - close(audio_device_fd); - - audio.device_name = audio_device_name[i]; - - return TRUE; -} - -static boolean ForkAudioProcess(void) -{ - if (pipe(audio.mixer_pipe) < 0) - { - Error(ERR_WARN, "cannot create pipe -- no sounds"); - return FALSE; - } - - if ((audio.mixer_pid = fork()) < 0) - { - Error(ERR_WARN, "cannot create sound server process -- no sounds"); - return FALSE; - } - - if (audio.mixer_pid == 0) /* we are the child process */ - audio.mixer_pid = getpid(); - - if (IS_CHILD_PROCESS()) - Mixer_Main(); /* this function never returns */ - else - close(audio.mixer_pipe[0]); /* no reading from pipe needed */ - - return TRUE; -} - -void UnixOpenAudio(void) -{ - if (!TestAudioDevices()) - return; - - audio.sound_available = TRUE; - audio.sound_enabled = TRUE; - -#if defined(AUDIO_STREAMING_DSP) - 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) -{ - if (audio.device_fd) - close(audio.device_fd); - - if (IS_PARENT_PROCESS() && HAS_CHILD_PROCESS()) - kill(audio.mixer_pid, SIGTERM); -} - - -/* ------------------------------------------------------------------------- */ -/* 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; - - /* 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()) - 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 */ /* ------------------------------------------------------------------------- */ @@ -633,10 +153,9 @@ static void Mixer_ResetChannelExpiration(int channel) { mixer[channel].playing_starttime = Counter(); -#if defined(TARGET_SDL) - if (IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel])) + if (expire_loop_sounds && + IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel])) Mix_ExpireChannel(channel, SOUND_LOOP_EXPIRATION_TIME); -#endif } static boolean Mixer_ChannelExpired(int channel) @@ -644,65 +163,35 @@ static boolean Mixer_ChannelExpired(int channel) if (!mixer[channel].active) return TRUE; - if (IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) && + if (expire_loop_sounds && + IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) && DelayReached(&mixer[channel].playing_starttime, SOUND_LOOP_EXPIRATION_TIME)) return TRUE; -#if defined(TARGET_SDL) - if (!Mix_Playing(channel)) return TRUE; -#elif defined(TARGET_ALLEGRO) - - mixer[channel].playing_pos = voice_get_position(mixer[channel].voice); - mixer[channel].volume = voice_get_volume(mixer[channel].voice); - - /* 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) @@ -730,15 +219,13 @@ 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); + // use short fade-in to prevent "plop" sound for certain music files + // (this may happen when switching on music while playing the game) Mix_VolumeMusic(mixer[audio.music_channel].volume); + Mix_FadeInMusic(mixer[audio.music_channel].data_ptr, -1, 100); } -#endif } static void Mixer_StopChannel(int channel) @@ -746,12 +233,7 @@ 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--; @@ -761,9 +243,9 @@ static void Mixer_StopMusicChannel() { Mixer_StopChannel(audio.music_channel); -#if defined(TARGET_SDL) Mix_HaltMusic(); -#endif + + setString(¤tly_playing_music_filename, NULL); } static void Mixer_FadeChannel(int channel) @@ -773,21 +255,16 @@ static void Mixer_FadeChannel(int channel) 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 + + setString(¤tly_playing_music_filename, NULL); } static void Mixer_UnFadeChannel(int channel) @@ -798,14 +275,8 @@ static void Mixer_UnFadeChannel(int channel) 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) @@ -857,6 +328,9 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) mixer[audio.music_channel] = snd_ctrl; Mixer_PlayMusicChannel(); + setString(¤tly_playing_music_filename, + getBaseNamePtr(snd_info->source_filename)); + return; } @@ -944,17 +418,6 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) unsigned int playing_current = Counter(); int longest = 0, longest_nr = audio.first_sound_channel; -#if 0 -#if DEBUG - /* print some debugging information about audio channel usage */ - for (i = audio.first_sound_channel; i < audio.num_channels; i++) - { - Error(ERR_INFO, "Mixer_InsertSound: %d [%d]: %d (%d)", - i, mixer[i].active, mixer[i].data_len, (int)mixer[i].data_ptr); - } -#endif -#endif - for (i = audio.first_sound_channel; i < audio.num_channels; i++) { int playing_time = playing_current - mixer[i].playing_starttime; @@ -975,13 +438,6 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) { if (!mixer[i].active) { -#if defined(AUDIO_UNIX_NATIVE) - if (snd_info->data_len == 0) - { - printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n"); - } -#endif - mixer[i] = snd_ctrl; Mixer_PlayChannel(i); @@ -994,14 +450,6 @@ static void HandleSoundRequest(SoundControl snd_ctrl) { int i; -#if defined(AUDIO_UNIX_NATIVE) - if (IS_PARENT_PROCESS()) - { - SendSoundControlToMixerProcess(&snd_ctrl); - return; - } -#endif - /* deactivate channels that have expired since the last request */ for (i = 0; i < audio.num_channels; i++) if (mixer[i].active && Mixer_ChannelExpired(i)) @@ -1013,11 +461,6 @@ static void HandleSoundRequest(SoundControl snd_ctrl) for (i = audio.first_sound_channel; i < audio.num_channels; i++) Mixer_StopChannel(i); -#if defined(AUDIO_UNIX_NATIVE) - CloseAudioDevice(&audio.device_fd); - ReadReloadInfoFromPipe(&snd_ctrl); -#endif - if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) ReloadCustomSounds(); else @@ -1046,11 +489,10 @@ static void HandleSoundRequest(SoundControl snd_ctrl) for (i = audio.first_sound_channel; i < audio.num_channels; i++) if (SAME_SOUND_NR(mixer[i], snd_ctrl) || ALL_SOUNDS(snd_ctrl)) Mixer_StopChannel(i); - -#if defined(AUDIO_UNIX_NATIVE) - if (!mixer_active_channels) - CloseAudioDevice(&audio.device_fd); -#endif + } + else if (SET_EXPIRE_LOOPS(snd_ctrl)) /* set loop expiration on or off */ + { + expire_loop_sounds = snd_ctrl.active; } else if (snd_ctrl.active) /* add new sound to mixer */ { @@ -1062,21 +504,6 @@ void StartMixer(void) { int i; -#if 0 - SDL_version compile_version; - const SDL_version *link_version; - MIX_VERSION(&compile_version); - printf("compiled with SDL_mixer version: %d.%d.%d\n", - compile_version.major, - compile_version.minor, - compile_version.patch); - link_version = Mix_Linked_Version(); - printf("running with SDL_mixer version: %d.%d.%d\n", - link_version->major, - link_version->minor, - link_version->patch); -#endif - if (!audio.sound_available) return; @@ -1084,446 +511,8 @@ void StartMixer(void) 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(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) -{ - 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) - { - byte *sample_ptr = (byte *)snd_ctrl->data_ptr + num_channels * sample_pos; - - for (i = 0; i < num_output_channels; i++) - { - int offset = (snd_ctrl->num_channels == 1 ? 0 : i); - - for (j = 0; j < sample_size; j++) - buffer_ptr[output_stepsize * j + i] = - ((short)(sample_ptr[stepsize * j + offset] ^ 0x80)) << 8; - } - } - else /* AUDIO_FORMAT_S16 */ - { - short *sample_ptr= (short *)snd_ctrl->data_ptr + num_channels * sample_pos; - - for (i = 0; i < num_output_channels; i++) - { - int offset = (snd_ctrl->num_channels == 1 ? 0 : i); - - for (j = 0; j < sample_size; j++) - buffer_ptr[output_stepsize * j + i] = - sample_ptr[stepsize * j + offset]; - } - } -} - -#if defined(AUDIO_STREAMING_DSP) -static void Mixer_Main_DSP() -{ - static short premix_first_buffer[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); - } - - 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++) - { - // void *sample_ptr; - int sample_len; - int sample_pos; - int sample_size; - - if (!mixer[i].active) - continue; - - if (Mixer_ChannelExpired(i)) - { - Mixer_StopChannel(i); - continue; - } - - /* 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); - - /* are we about to restart a looping sound? */ - if (IS_LOOP(mixer[i]) && sample_size < max_sample_size) - { - while (sample_size < max_sample_size) - { - int restarted_sample_size = - MIN(max_sample_size - sample_size, sample_len); - - CopySampleToMixingBuffer(&mixer[i], 0, restarted_sample_size, - premix_first_buffer, sample_size, - num_output_channels); - - mixer[i].playing_pos = restarted_sample_size; - sample_size += restarted_sample_size; - } - } - - /* decrease volume if sound is fading out */ - if (IS_FADING(mixer[i]) && - mixer[i].volume >= SOUND_FADING_VOLUME_THRESHOLD) - mixer[i].volume -= SOUND_FADING_VOLUME_STEP; - - /* 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; - - /* adjust left and right channel volume due to stereo sound position */ - if (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 < sample_size; 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; - } - } - - /* fill the last mixing buffer with stereo or mono sound */ - for (j = 0; j < sample_size * num_output_channels; j++) - premix_last_buffer[j] += premix_first_buffer[j]; - - /* delete completed sound entries from the mixer */ - if (mixer[i].playing_pos >= mixer[i].data_len) - { - 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); - } - - /* 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; - - /* shift to 16 bit value */ - premix_last_buffer[i] >>= 1; - - if (afmt.format & AUDIO_FORMAT_U8) - { - playing_buffer[i] = (premix_last_buffer[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; - } - } - - /* 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); -} - -#else /* !AUDIO_STREAMING_DSP */ - -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 */ - -void Mixer_Main() -{ - SoundControl snd_ctrl; - fd_set mixer_fdset; - - close(audio.mixer_pipe[1]); /* no writing into pipe needed */ - - Mixer_InitChannels(); - -#if defined(PLATFORM_HPUX) - InitAudioDevice(&afmt); -#endif - - FD_ZERO(&mixer_fdset); - FD_SET(audio.mixer_pipe[0], &mixer_fdset); - - while (1) /* wait for sound playing commands from client */ - { - struct timeval delay = { 0, 0 }; - - 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; - - ReadSoundControlFromMainProcess(&snd_ctrl); - - HandleSoundRequest(snd_ctrl); - -#if defined(AUDIO_STREAMING_DSP) - - while (mixer_active_channels && - select(audio.mixer_pipe[0] + 1, - &mixer_fdset, NULL, NULL, &delay) < 1) - { - FD_SET(audio.mixer_pipe[0], &mixer_fdset); - - Mixer_Main_DSP(); - } - -#else /* !AUDIO_STREAMING_DSP */ - - if (!snd_ctrl.active || IS_LOOP(snd_ctrl) || - (audio.device_fd = OpenAudioDevice(audio.device_name)) < 0) - continue; - - InitAudioDevice(&afmt); - - delay.tv_sec = 0; - delay.tv_usec = 0; - - 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; - - FD_SET(audio.mixer_pipe[0], &mixer_fdset); - - sample_size = Mixer_Main_SimpleAudio(snd_ctrl); - - 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 /* AUDIO_UNIX_NATIVE */ - - -#if defined(AUDIO_UNIX_NATIVE) && !defined(AUDIO_STREAMING_DSP) - -/* these two are stolen from "sox"... :) */ - -/* -** This routine converts from linear to ulaw. -** -** Craig Reese: IDA/Supercomputing Research Center -** Joe Campbell: Department of Defense -** 29 September 1989 -** -** References: -** 1) CCITT Recommendation G.711 (very difficult to follow) -** 2) "A New Digital Technique for Implementation of Any -** Continuous PCM Companding Law," Villeret, Michel, -** et al. 1973 IEEE Int. Conf. on Communications, Vol 1, -** 1973, pg. 11.12-11.17 -** 3) MIL-STD-188-113,"Interoperability and Performance Standards -** for Analog-to_Digital Conversion Techniques," -** 17 February 1987 -** -** Input: Signed 16 bit linear sample -** Output: 8 bit ulaw sample -*/ - -#define ZEROTRAP /* turn on the trap as per the MIL-STD */ -#define BIAS 0x84 /* define the add-in bias for 16 bit samples */ -#define CLIP 32635 - -static unsigned char linear_to_ulaw(int sample) -{ - static int exp_lut[256] = - { - 0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3, - 4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, - 5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, - 7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7 - }; - - int sign, exponent, mantissa; - unsigned char ulawbyte; - - /* Get the sample into sign-magnitude. */ - sign = (sample >> 8) & 0x80; /* set aside the sign */ - if (sign != 0) - sample = -sample; /* get magnitude */ - if (sample > CLIP) - sample = CLIP; /* clip the magnitude */ - - /* Convert from 16 bit linear to ulaw. */ - sample = sample + BIAS; - exponent = exp_lut[( sample >> 7 ) & 0xFF]; - mantissa = ( sample >> ( exponent + 3 ) ) & 0x0F; - ulawbyte = ~ ( sign | ( exponent << 4 ) | mantissa ); -#ifdef ZEROTRAP - if (ulawbyte == 0) - ulawbyte = 0x02; /* optional CCITT trap */ -#endif - - return(ulawbyte); -} - -/* -** This routine converts from ulaw to 16 bit linear. -** -** Craig Reese: IDA/Supercomputing Research Center -** 29 September 1989 -** -** References: -** 1) CCITT Recommendation G.711 (very difficult to follow) -** 2) MIL-STD-188-113,"Interoperability and Performance Standards -** for Analog-to_Digital Conversion Techniques," -** 17 February 1987 -** -** Input: 8 bit ulaw sample -** Output: signed 16 bit linear sample -*/ - -static int ulaw_to_linear(unsigned char ulawbyte) -{ - static int exp_lut[8] = { 0, 132, 396, 924, 1980, 4092, 8316, 16764 }; - int sign, exponent, mantissa, sample; - - ulawbyte = ~ ulawbyte; - sign = ( ulawbyte & 0x80 ); - exponent = ( ulawbyte >> 4 ) & 0x07; - mantissa = ulawbyte & 0x0F; - sample = exp_lut[exponent] + ( mantissa << ( exponent + 3 ) ); - if (sign != 0) - sample = -sample; - - return(sample); -} -#endif /* AUDIO_UNIX_NATIVE && !AUDIO_STREAMING_DSP */ - /* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ /* ========================================================================= */ @@ -1535,210 +524,21 @@ static int ulaw_to_linear(unsigned char ulawbyte) static void *Load_WAV(char *filename) { 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; -#endif if (!audio.sound_available) return NULL; snd_info = checked_calloc(sizeof(SoundInfo)); -#if defined(TARGET_SDL) - if ((snd_info->data_ptr = Mix_LoadWAV(filename)) == NULL) { - Error(ERR_WARN, "cannot read sound file '%s'", filename); + Error(ERR_WARN, "cannot read sound file '%s': %s", filename, Mix_GetError()); free(snd_info); 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) - { - 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); - free(snd_info); - return NULL; - } - - /* read chunk id "RIFF" */ - getFileChunkLE(file, chunk_name, &chunk_size); - if (!strEqual(chunk_name, "RIFF")) - { - Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); - fclose(file); - free(snd_info); - return NULL; - } - - /* read "RIFF" type id "WAVE" */ - getFileChunkLE(file, chunk_name, NULL); - if (!strEqual(chunk_name, "WAVE")) - { - Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename); - fclose(file); - free(snd_info); - return NULL; - } - - while (getFileChunkLE(file, chunk_name, &chunk_size)) - { - 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; - } - - 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 (strEqual(chunk_name, "data")) - { - 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 */ - if (fread(snd_info->data_ptr, 1, snd_info->data_len, file) != - snd_info->data_len) - { - Error(ERR_WARN,"cannot read 'data' chunk of sound file '%s'",filename); - fclose(file); - free(snd_info->data_ptr); - free(snd_info); - return NULL; - } - - /* check for odd number of data bytes (data chunk is word aligned) */ - if ((data_byte_len % 2) == 1) - ReadUnusedBytesFromFile(file, 1); - } - else /* unknown chunk -- ignore */ - ReadUnusedBytesFromFile(file, chunk_size); - } - - fclose(file); - - if (snd_info->data_ptr == NULL) - { - Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename); - free(snd_info); - return NULL; - } - - 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 */ - -#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; 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 - -#endif /* AUDIO_UNIX_NATIVE */ - snd_info->type = SND_TYPE_WAV; snd_info->source_filename = getStringCopy(filename); @@ -1747,7 +547,6 @@ static void *Load_WAV(char *filename) static void *Load_MOD(char *filename) { -#if defined(TARGET_SDL) MusicInfo *mod_info; if (!audio.sound_available) @@ -1757,7 +556,7 @@ static void *Load_MOD(char *filename) if ((mod_info->data_ptr = Mix_LoadMUS(filename)) == NULL) { - Error(ERR_WARN, "cannot read music file '%s'", filename); + Error(ERR_WARN, "cannot read music file '%s': %s", filename, Mix_GetError()); free(mod_info); return NULL; } @@ -1766,28 +565,16 @@ static void *Load_MOD(char *filename) mod_info->source_filename = getStringCopy(filename); return mod_info; -#else - 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 } void LoadCustomMusic_NoConf(void) @@ -1795,8 +582,8 @@ 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; + Directory *dir; + DirectoryEntry *dir_entry; int num_music = getMusicListSize(); if (!audio.sound_available) @@ -1812,20 +599,21 @@ void LoadCustomMusic_NoConf(void) FreeAllMusic_NoConf(); - if ((dir = opendir(music_directory)) == NULL) + if ((dir = openDirectory(music_directory)) == NULL) { Error(ERR_WARN, "cannot read music directory '%s'", music_directory); + audio.music_available = FALSE; + return; } if (draw_init_text) DrawInitText("Loading music", 120, FC_GREEN); - while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ + while ((dir_entry = readDirectory(dir)) != NULL) /* loop all entries */ { - char *basename = dir_entry->d_name; - char *filename = NULL; + char *basename = dir_entry->basename; MusicInfo *mus_info = NULL; boolean music_already_used = FALSE; int i; @@ -1848,12 +636,8 @@ void LoadCustomMusic_NoConf(void) if (draw_init_text) DrawInitText(basename, 150, FC_YELLOW); - filename = getPath2(music_directory, basename); - - if (FileIsMusic(basename)) - mus_info = Load_WAV_or_MOD(filename); - - free(filename); + if (FileIsMusic(dir_entry->filename)) + mus_info = Load_WAV_or_MOD(dir_entry->filename); if (mus_info) { @@ -1864,7 +648,7 @@ void LoadCustomMusic_NoConf(void) } } - closedir(dir); + closeDirectory(dir); draw_init_text = FALSE; } @@ -1921,6 +705,11 @@ static MusicInfo *getMusicInfoEntryFromMusicID(int pos) return mus_info[list_pos]; } +char *getCurrentlyPlayingMusicFilename() +{ + return currently_playing_music_filename; +} + int getSoundListPropertyMappingSize() { return sound_info->num_property_mapping_entries; @@ -2101,21 +890,33 @@ void PlayMusic(int nr) void PlaySound(int nr) { + if (!setup.sound_simple) + return; + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_SOUND); } void PlaySoundStereo(int nr, int stereo_position) { + if (!setup.sound_simple) + return; + PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND); } void PlaySoundLoop(int nr) { + if (!setup.sound_loops) + return; + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP); } void PlaySoundMusic(int nr) { + if (!setup.sound_music) + return; + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC); } @@ -2210,22 +1011,29 @@ void StopSoundExt(int nr, int state) HandleSoundRequest(snd_ctrl); } -static void ReloadCustomSounds() +void ExpireSoundLoops(boolean active) { -#if 0 - printf("::: reloading sounds '%s' ...\n", artwork.snd_current_identifier); -#endif + SoundControl snd_ctrl; + if (!audio.sound_available) + return; + + clear_mem(&snd_ctrl, sizeof(SoundControl)); /* to make valgrind happy */ + + snd_ctrl.active = active; + snd_ctrl.state = SND_CTRL_EXPIRE_LOOPS; + + HandleSoundRequest(snd_ctrl); +} + +static void ReloadCustomSounds() +{ LoadArtworkConfig(sound_info); ReloadCustomArtworkList(sound_info); } static void ReloadCustomMusic() { -#if 0 - printf("::: reloading music '%s' ...\n", artwork.mus_current_identifier); -#endif - LoadArtworkConfig(music_info); ReloadCustomArtworkList(music_info); @@ -2238,12 +1046,7 @@ void InitReloadCustomSounds(char *set_identifier) if (!audio.sound_available) return; -#if defined(AUDIO_UNIX_NATIVE) - LoadArtworkConfig(sound_info); /* also load config on sound client */ - WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_SOUNDS); -#else ReloadCustomSounds(); -#endif } void InitReloadCustomMusic(char *set_identifier) @@ -2251,12 +1054,7 @@ void InitReloadCustomMusic(char *set_identifier) if (!audio.music_available) return; -#if defined(AUDIO_UNIX_NATIVE) - LoadArtworkConfig(music_info); /* also load config on sound client */ - WriteReloadInfoToPipe(set_identifier, SND_CTRL_RELOAD_MUSIC); -#else ReloadCustomMusic(); -#endif } void FreeSound(void *ptr) @@ -2268,13 +1066,7 @@ void FreeSound(void *ptr) if (sound->data_ptr) { -#if defined(TARGET_SDL) 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); @@ -2291,16 +1083,10 @@ void FreeMusic(void *ptr) if (music->data_ptr) { -#if defined(TARGET_SDL) if (music->type == MUS_TYPE_MOD) Mix_FreeMusic(music->data_ptr); else Mix_FreeChunk(music->data_ptr); -#elif defined(TARGET_ALLEGRO) - destroy_sample(music->data_ptr); -#else /* AUDIO_UNIX_NATIVE */ - free(music->data_ptr); -#endif } free(music);