X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=414ab122befa69174fd501a16ec44763f0a41797;hb=86e110774e5210b326e6867b134bd638d93554d3;hp=d451e6ecf58616a0f5403a815059974bcb917a98;hpb=6d37ddaaf9915af0f483f4fc04d07b98e99e091e;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index d451e6ec..414ab122 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -17,15 +17,138 @@ #include #include #include +#include + +#include "platform.h" + +#if defined(PLATFORM_LINUX) +#include +#include +#elif defined(PLATFORM_FREEBSD) +#include +#elif defined(PLATFORM_NETBSD) +#include +#include +#elif defined(PLATFORM_HPUX) +#include +#endif #include "system.h" #include "sound.h" #include "misc.h" #include "setup.h" +#include "text.h" + + +/* expiration time (in milliseconds) for sound loops */ +#define SOUND_LOOP_EXPIRATION_TIME 200 +/* one second fading interval == 1000 ticks (milliseconds) */ +#define SOUND_FADING_INTERVAL 1000 + +#if defined(AUDIO_STREAMING_DSP) +#define SOUND_FADING_VOLUME_STEP (SOUND_MAX_VOLUME / 40) +#define SOUND_FADING_VOLUME_THRESHOLD (SOUND_FADING_VOLUME_STEP * 2) +#endif + +#if !defined(PLATFORM_HPUX) +#define SND_BLOCKSIZE 4096 +#else +#define SND_BLOCKSIZE 32768 +#endif -#define IS_PARENT_PROCESS(pid) ((pid) > 0) -#define IS_CHILD_PROCESS(pid) ((pid) == 0) +#define SND_TYPE_NONE 0 +#define SND_TYPE_WAV 1 + +#define MUS_TYPE_NONE 0 +#define MUS_TYPE_WAV 1 +#define MUS_TYPE_MOD 2 + +#define DEVICENAME_DSP "/dev/dsp" +#define DEVICENAME_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) + +#if 0 +struct SoundHeader_SUN +{ + unsigned long magic; + unsigned long hdr_size; + unsigned long data_size; + unsigned long encoding; + unsigned long sample_rate; + unsigned long channels; +}; + +struct SoundHeader_8SVX +{ + char magic_FORM[4]; + unsigned long chunk_size; + char magic_8SVX[4]; +}; +#endif + +#if defined(AUDIO_UNIX_NATIVE) +struct SoundHeader_WAV +{ + unsigned short compression_code; + unsigned short num_channels; + unsigned long sample_rate; + unsigned long bytes_per_second; + unsigned short block_align; + unsigned short bits_per_sample; +}; +#endif + +struct AudioFormatInfo +{ + boolean stereo; /* availability of stereo sound */ + int format; /* size and endianess of sample data */ + int sample_rate; /* sample frequency */ + int fragment_size; /* audio device fragment size in bytes */ +}; + +struct SampleInfo +{ + char *source_filename; + int num_references; + + int type; + int format; + void *data_ptr; /* pointer to first sample (8 or 16 bit) */ + long data_len; /* number of samples, NOT number of bytes */ +}; +typedef struct SampleInfo SoundInfo; +typedef struct SampleInfo MusicInfo; + +struct SoundControl +{ + boolean active; + + int nr; + int volume; + int stereo_position; + + int state; + + unsigned long playing_starttime; + unsigned long playing_pos; + + int type; + int format; + void *data_ptr; /* pointer to first sample (8 or 16 bit) */ + long data_len; /* number of samples, NOT number of bytes */ + +#if defined(TARGET_ALLEGRO) + int voice; +#endif +}; +typedef struct SoundControl SoundControl; struct ListNode { @@ -47,29 +170,36 @@ static ListNode *SoundFileList = NULL; static SoundInfo **Sound = NULL; static MusicInfo **Music = NULL; static int num_sounds = 0, num_music = 0; +static int stereo_volume[SOUND_MAX_LEFT2RIGHT + 1]; /* ========================================================================= */ /* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ -static struct AudioFormatInfo afmt; static struct SoundControl mixer[NUM_MIXER_CHANNELS]; static int mixer_active_channels = 0; -/* forward declaration of internal functions */ -static void InitAudioDevice(struct AudioFormatInfo *); -static void Mixer_Main(void); +#if defined(AUDIO_UNIX_NATIVE) +static struct AudioFormatInfo afmt; -#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP) +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 void ReloadCustomSounds(); static void ReloadCustomMusic(); static void FreeSound(void *); -#if defined(PLATFORM_UNIX) + +/* ------------------------------------------------------------------------- */ +/* functions for native (non-SDL) Unix audio/mixer support */ +/* ------------------------------------------------------------------------- */ + +#if defined(AUDIO_UNIX_NATIVE) + static int OpenAudioDevice(char *audio_device_name) { int audio_device_fd; @@ -126,7 +256,6 @@ static boolean TestAudioDevices(void) return TRUE; } -#if !defined(TARGET_SDL) static boolean ForkAudioProcess(void) { if (pipe(audio.mixer_pipe) < 0) @@ -148,7 +277,6 @@ static boolean ForkAudioProcess(void) return TRUE; } -#endif void UnixOpenAudio(void) { @@ -177,6 +305,167 @@ void UnixCloseAudio(void) 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; + 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 /dev/dsp -- no sounds"); + + i = 0; + afmt->format = 0; + while (formats[i].format_result != -1) + { + unsigned int audio_format = formats[i].format_ioctl; + if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0) + { + afmt->format = formats[i].format_result; + break; + } + } + + if (afmt->format == 0) /* no supported audio format found */ + Error(ERR_EXIT_SOUND_SERVER, + "cannot set audio format of /dev/dsp -- no sounds"); + + /* try if we can use stereo sound */ + afmt->stereo = TRUE; + if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) + afmt->stereo = FALSE; + + if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set sample rate of /dev/dsp -- no sounds"); + + /* get the real fragmentation size; this should return 512 */ + if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot get fragment size of /dev/dsp -- no sounds"); + if (fragment_size_query != afmt->fragment_size) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set fragment size of /dev/dsp -- no sounds"); +} +#endif /* AUDIO_LINUX_IOCTL */ + +#if defined(PLATFORM_NETBSD) +static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) +{ + audio_info_t a_info; + boolean stereo = TRUE; + + AUDIO_INITINFO(&a_info); + a_info.play.encoding = AUDIO_ENCODING_LINEAR8; + a_info.play.precision = 8; + a_info.play.channels = 2; + a_info.play.sample_rate = sample_rate; + a_info.blocksize = fragment_size; + + afmt->format = AUDIO_FORMAT_U8; + afmt->stereo = TRUE; + + if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + { + /* try to disable stereo */ + a_info.play.channels = 1; + + afmt->stereo = FALSE; + + if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) + Error(ERR_EXIT_SOUND_SERVER, + "cannot set sample rate of /dev/audio -- no sounds"); + } +} +#endif /* PLATFORM_NETBSD */ + +#if defined(PLATFORM_HPUX) +static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) +{ + struct audio_describe ainfo; + int audio_ctl; + + audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); + if (audio_ctl == -1) + Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); + + if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) + Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds"); + + if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) + Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds"); + + ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); + ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); + + afmt->format = AUDIO_FORMAT_U8; + afmt->stereo = FALSE; + afmt->sample_rate = 8000; + + close(audio_ctl); +} +#endif /* PLATFORM_HPUX */ + +static void InitAudioDevice(struct AudioFormatInfo *afmt) +{ + afmt->stereo = TRUE; + afmt->format = AUDIO_FORMAT_UNKNOWN; + afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; + afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; + +#if defined(AUDIO_LINUX_IOCTL) + InitAudioDevice_Linux(afmt); +#elif defined(PLATFORM_NETBSD) + InitAudioDevice_NetBSD(afmt); +#elif defined(PLATFORM_HPUX) + InitAudioDevice_HPUX(afmt); +#else + /* generic /dev/audio stuff might be placed here */ +#endif +} + + +/* ------------------------------------------------------------------------- */ +/* functions for communication between main process and sound mixer process */ +/* ------------------------------------------------------------------------- */ + static void SendSoundControlToMixerProcess(SoundControl *snd_ctrl) { if (IS_CHILD_PROCESS(audio.mixer_pid)) @@ -301,7 +590,13 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) else artwork.music_set_current = set_name; } -#endif /* PLATFORM_UNIX */ + +#endif /* AUDIO_UNIX_NATIVE */ + + +/* ------------------------------------------------------------------------- */ +/* mixer functions */ +/* ------------------------------------------------------------------------- */ void Mixer_InitChannels() { @@ -312,34 +607,99 @@ void Mixer_InitChannels() mixer_active_channels = 0; } -static void Mixer_PlayChannel(int channel) +static void Mixer_ResetChannelExpiration(int channel) { - /* start with inactive channel in case something goes wrong */ - mixer[channel].active = FALSE; + mixer[channel].playing_starttime = Counter(); - if (IS_MUSIC_MODULE(mixer[channel])) - return; +#if defined(TARGET_SDL) + if (IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel])) + Mix_ExpireChannel(channel, SOUND_LOOP_EXPIRATION_TIME); +#endif +} - mixer[channel].playingpos = 0; - mixer[channel].playingtime = 0; +static boolean Mixer_ChannelExpired(int channel) +{ + if (!mixer[channel].active) + return TRUE; + + if (IS_LOOP(mixer[channel]) && !IS_MUSIC(mixer[channel]) && + DelayReached(&mixer[channel].playing_starttime, + SOUND_LOOP_EXPIRATION_TIME)) + return TRUE; #if defined(TARGET_SDL) - Mix_Volume(channel, SOUND_MAX_VOLUME); - Mix_PlayChannel(channel, mixer[channel].data_ptr, - IS_LOOP(mixer[channel]) ? -1 : 0); -#elif defined(PLATFORM_MSDOS) + + 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; + 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_set_volume(mixer[channel].voice, mixer[channel].volume); - voice_set_pan(mixer[channel].voice, mixer[channel].stereo); voice_start(mixer[channel].voice); #endif +} + +static void Mixer_PlayChannel(int channel) +{ + /* start with inactive channel in case something goes wrong */ + mixer[channel].active = FALSE; + + if (mixer[channel].type != MUS_TYPE_WAV) + return; + + if (!Mixer_AllocateChannel(channel)) + return; + + Mixer_SetChannelProperties(channel); + Mixer_StartChannel(channel); + Mixer_ResetChannelExpiration(channel); + + mixer[channel].playing_pos = 0; mixer[channel].active = TRUE; mixer_active_channels++; } @@ -349,7 +709,7 @@ static void Mixer_PlayMusicChannel() Mixer_PlayChannel(audio.music_channel); #if defined(TARGET_SDL) - if (IS_MUSIC_MODULE(mixer[audio.music_channel])) + 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 */ @@ -361,12 +721,12 @@ static void Mixer_PlayMusicChannel() static void Mixer_StopChannel(int channel) { - if (!mixer_active_channels || !mixer[channel].active) + if (!mixer[channel].active) return; #if defined(TARGET_SDL) Mix_HaltChannel(channel); -#elif defined(PLATFORM_MSDOS) +#elif defined(TARGET_ALLEGRO) voice_set_volume(mixer[channel].voice, 0); deallocate_voice(mixer[channel].voice); #endif @@ -386,14 +746,16 @@ static void Mixer_StopMusicChannel() static void Mixer_FadeChannel(int channel) { + if (!mixer[channel].active) + return; + mixer[channel].state |= SND_CTRL_FADE; #if defined(TARGET_SDL) Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL); -#elif defined(PLATFORM_MSDOS) +#elif defined(TARGET_ALLEGRO) if (voice_check(mixer[channel].voice)) voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, 0); - mixer[channel].state &= ~SND_CTRL_IS_LOOP; #endif } @@ -406,6 +768,24 @@ static void Mixer_FadeMusicChannel() #endif } +static void Mixer_UnFadeChannel(int channel) +{ + if (!mixer[channel].active || !IS_FADING(mixer[channel])) + return; + + mixer[channel].state &= ~SND_CTRL_FADE; + mixer[channel].volume = SOUND_MAX_VOLUME; + +#if defined(TARGET_SDL) + Mix_ExpireChannel(channel, -1); + Mix_Volume(channel, mixer[channel].volume); +#elif defined(TARGET_ALLEGRO) + voice_stop_volumeramp(mixer[channel].voice); + voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, + mixer[channel].volume); +#endif +} + static void Mixer_InsertSound(SoundControl snd_ctrl) { SoundInfo *snd_info; @@ -415,6 +795,10 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds); #endif +#if 0 + printf("%d ACTIVE CHANNELS\n", mixer_active_channels); +#endif + if (IS_MUSIC(snd_ctrl)) snd_ctrl.nr = snd_ctrl.nr % num_music; else if (snd_ctrl.nr >= num_sounds) @@ -425,52 +809,87 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) 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.format = snd_info->format; + /* play music samples on a dedicated music channel */ if (IS_MUSIC(snd_ctrl)) { - mixer[audio.music_channel] = snd_ctrl; +#if 0 + printf("PLAY MUSIC WITH VOLUME/STEREO %d/%d\n", + snd_ctrl.volume, snd_ctrl.stereo_position); +#endif - Mixer_PlayChannel(audio.music_channel); + 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 %d\n", mixer_active_channels); + printf("SOUND %d [CURRENTLY PLAYING %d TIMES]\n", snd_ctrl.nr, k); #endif - if (mixer_active_channels == audio.num_channels) + /* reset expiration delay for already playing loop sounds */ + if (k > 0 && IS_LOOP(snd_ctrl)) { - for (i=0; i= 2) { + unsigned long playing_current = Counter(); int longest = 0, longest_nr = audio.first_sound_channel; - for (i=audio.first_sound_channel; i longest) + if (!mixer[i].active || !SAME_SOUND_NR(mixer[i], snd_ctrl)) + continue; + + actual = 1000 * playing_time / mixer[i].data_len; + + if (actual >= longest) { longest = actual; longest_nr = i; @@ -480,50 +899,24 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) Mixer_StopChannel(longest_nr); } - /* check if sound is already being played (and how often) */ - for (k=0, i=audio.first_sound_channel; i= 1 && IS_LOOP(snd_ctrl)) - { - for(i=audio.first_sound_channel; i= 2) + if (mixer_active_channels == + audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1)) { + unsigned long playing_current = Counter(); int longest = 0, longest_nr = audio.first_sound_channel; - /* look for oldest equal sound */ - for(i=audio.first_sound_channel; i= longest) + if (!IS_LOOP(mixer[i]) && actual > longest) { longest = actual; longest_nr = i; @@ -533,7 +926,7 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) Mixer_StopChannel(longest_nr); } - /* add new sound to mixer */ + /* add the new sound to the mixer */ for(i=0; idata_len == 0) { printf("THIS SHOULD NEVER HAPPEN! [snd_info->data_len == 0]\n"); } #endif +#endif #if 1 if (IS_MUSIC(snd_ctrl) && i == audio.music_channel && mixer[i].active) @@ -569,14 +964,7 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) } #endif -#if 0 - snd_ctrl.data_ptr = snd_info->data_ptr; - snd_ctrl.data_len = snd_info->data_len; - snd_ctrl.format = snd_info->format; -#endif - mixer[i] = snd_ctrl; - Mixer_PlayChannel(i); break; @@ -594,25 +982,23 @@ static void HandleSoundRequest(SoundControl snd_ctrl) SendSoundControlToMixerProcess(&snd_ctrl); return; } -#elif defined(TARGET_ALLEGRO) - for (i=0; imajor, + link_version->minor, + link_version->patch); +#endif + if (!audio.sound_available) return; -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) + /* initialize stereo position conversion information */ + for(i=0; i<=SOUND_MAX_LEFT2RIGHT; i++) + stereo_volume[i] = + (int)sqrt((float)(SOUND_MAX_LEFT2RIGHT * SOUND_MAX_LEFT2RIGHT - i * i)); + +#if defined(AUDIO_UNIX_NATIVE) if (!ForkAudioProcess()) audio.sound_available = FALSE; #endif } -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) +#if defined(AUDIO_UNIX_NATIVE) static void CopySampleToMixingBuffer(SoundControl *snd_ctrl, int sample_pos, int sample_size, @@ -691,8 +1095,6 @@ static void CopySampleToMixingBuffer(SoundControl *snd_ctrl, #if defined(AUDIO_STREAMING_DSP) static void Mixer_Main_DSP() { - static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1]; - static boolean stereo_volume_calculated = FALSE; static short premix_first_buffer[SND_BLOCKSIZE]; static short premix_left_buffer[SND_BLOCKSIZE]; static short premix_right_buffer[SND_BLOCKSIZE]; @@ -704,15 +1106,6 @@ static void Mixer_Main_DSP() int max_sample_size; int i, j; - if (!stereo_volume_calculated) - { - for(i=0; i<=PSND_MAX_LEFT2RIGHT; i++) - stereo_volume[i] = - (int)sqrt((float)(PSND_MAX_LEFT2RIGHT * PSND_MAX_LEFT2RIGHT - i * i)); - - stereo_volume_calculated = TRUE; - } - if (!mixer_active_channels) return; @@ -743,12 +1136,18 @@ static void Mixer_Main_DSP() 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].playingpos; + sample_pos = mixer[i].playing_pos; sample_size = MIN(max_sample_size, sample_len - sample_pos); - mixer[i].playingpos += sample_size; + mixer[i].playing_pos += sample_size; /* copy original sample to first mixing buffer */ CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size, @@ -771,7 +1170,7 @@ static void Mixer_Main_DSP() premix_first_buffer[sample_size + j] = ((short *)sample_ptr)[j]; - mixer[i].playingpos = restarted_sample_size; + mixer[i].playing_pos = restarted_sample_size; sample_size += restarted_sample_size; } } @@ -782,27 +1181,23 @@ static void Mixer_Main_DSP() mixer[i].volume -= SOUND_FADING_VOLUME_STEP; /* adjust volume of actual sound sample */ - if (mixer[i].volume != PSND_MAX_VOLUME) + if (mixer[i].volume != SOUND_MAX_VOLUME) for(j=0; j> PSND_MAX_VOLUME_BITS; + mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME; /* fill the last mixing buffer with stereo or mono sound */ if (stereo) { - int middle_pos = PSND_MAX_LEFT2RIGHT / 2; - int left_volume = stereo_volume[middle_pos + mixer[i].stereo]; - int right_volume= stereo_volume[middle_pos - mixer[i].stereo]; + int left_volume = SOUND_VOLUME_LEFT(mixer[i].stereo_position); + int right_volume = SOUND_VOLUME_RIGHT(mixer[i].stereo_position); for(j=0; j> PSND_MAX_LEFT2RIGHT_BITS; + left_volume * premix_first_buffer[j] / SOUND_MAX_LEFT2RIGHT; premix_right_buffer[j] = - (right_volume * premix_first_buffer[j]) - >> PSND_MAX_LEFT2RIGHT_BITS; + right_volume * premix_first_buffer[j] / SOUND_MAX_LEFT2RIGHT; premix_last_buffer[2 * j + 0] += premix_left_buffer[j]; premix_last_buffer[2 * j + 1] += premix_right_buffer[j]; @@ -815,10 +1210,10 @@ static void Mixer_Main_DSP() } /* delete completed sound entries from the mixer */ - if (mixer[i].playingpos >= mixer[i].data_len) + if (mixer[i].playing_pos >= mixer[i].data_len) { if (IS_LOOP(mixer[i])) - mixer[i].playingpos = 0; + mixer[i].playing_pos = 0; else Mixer_StopChannel(i); } @@ -879,20 +1274,19 @@ static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl) /* 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].playingpos; + sample_pos = mixer[i].playing_pos; sample_size = MIN(max_sample_size, sample_len - sample_pos); - mixer[i].playingpos += sample_size; + mixer[i].playing_pos += sample_size; /* copy original sample to first mixing buffer */ CopySampleToMixingBuffer(&mixer[i], sample_pos, sample_size, premix_first_buffer); /* adjust volume of actual sound sample */ - if (mixer[i].volume != PSND_MAX_VOLUME) + if (mixer[i].volume != SOUND_MAX_VOLUME) for(j=0; j> PSND_MAX_VOLUME_BITS; + mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME; /* might be needed for u-law /dev/audio */ #if 0 @@ -902,7 +1296,7 @@ static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl) #endif /* delete completed sound entries from the mixer */ - if (mixer[i].playingpos >= mixer[i].data_len) + if (mixer[i].playing_pos >= mixer[i].data_len) Mixer_StopChannel(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 /dev/dsp -- no sounds"); - - i = 0; - afmt->format = 0; - while (formats[i].format_result != -1) - { - unsigned int audio_format = formats[i].format_ioctl; - if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0) - { - afmt->format = formats[i].format_result; - break; - } - } - - if (afmt->format == 0) /* no supported audio format found */ - Error(ERR_EXIT_SOUND_SERVER, - "cannot set audio format of /dev/dsp -- no sounds"); - - /* try if we can use stereo sound */ - afmt->stereo = TRUE; - if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) - afmt->stereo = FALSE; - - if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &afmt->sample_rate) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/dsp -- no sounds"); - - /* get the real fragmentation size; this should return 512 */ - if (ioctl(audio.device_fd, SNDCTL_DSP_GETBLKSIZE, &fragment_size_query) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot get fragment size of /dev/dsp -- no sounds"); - if (fragment_size_query != afmt->fragment_size) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set fragment size of /dev/dsp -- no sounds"); -} -#endif /* AUDIO_LINUX_IOCTL */ - -#if defined(PLATFORM_NETBSD) -static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) -{ - audio_info_t a_info; - boolean stereo = TRUE; - - AUDIO_INITINFO(&a_info); - a_info.play.encoding = AUDIO_ENCODING_LINEAR8; - a_info.play.precision = 8; - a_info.play.channels = 2; - a_info.play.sample_rate = sample_rate; - a_info.blocksize = fragment_size; - - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = TRUE; - - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - { - /* try to disable stereo */ - a_info.play.channels = 1; - - afmt->stereo = FALSE; - - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/audio -- no sounds"); - } -} -#endif /* PLATFORM_NETBSD */ - -#if defined(PLATFORM_HPUX) -static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) -{ - struct audio_describe ainfo; - int audio_ctl; - - audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); - if (audio_ctl == -1) - Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); - - if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds"); - - if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) - Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds"); - - ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); - ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); - - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = FALSE; - afmt->sample_rate = 8000; - - close(audio_ctl); -} -#endif /* PLATFORM_HPUX */ +#endif /* AUDIO_UNIX_NATIVE */ -#if defined(PLATFORM_UNIX) -static void InitAudioDevice(struct AudioFormatInfo *afmt) -{ - afmt->stereo = TRUE; - afmt->format = AUDIO_FORMAT_UNKNOWN; - afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; - afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; - -#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 -} -#endif /* PLATFORM_UNIX */ -#if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP) +#if defined(AUDIO_UNIX_NATIVE) && !defined(AUDIO_STREAMING_DSP) /* these two are stolen from "sox"... :) */ @@ -1254,7 +1491,7 @@ static int ulaw_to_linear(unsigned char ulawbyte) return(sample); } -#endif /* PLATFORM_UNIX && !AUDIO_STREAMING_DSP */ +#endif /* AUDIO_UNIX_NATIVE && !AUDIO_STREAMING_DSP */ /* THE STUFF ABOVE IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ @@ -1267,12 +1504,15 @@ static int ulaw_to_linear(unsigned char ulawbyte) static SoundInfo *Load_WAV(char *filename) { SoundInfo *snd_info; -#if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS) +#if defined(AUDIO_UNIX_NATIVE) + struct SoundHeader_WAV header; +#if 0 byte sound_header_buffer[WAV_HEADER_SIZE]; + int i; +#endif char chunk_name[CHUNK_ID_LEN + 1]; int chunk_size; FILE *file; - int i; #endif if (!audio.sound_available) @@ -1293,6 +1533,8 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } + snd_info->data_len = ((Mix_Chunk *)snd_info->data_ptr)->alen; + #elif defined(TARGET_ALLEGRO) if ((snd_info->data_ptr = load_sample(filename)) == NULL) @@ -1302,7 +1544,9 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } -#else /* PLATFORM_UNIX */ + snd_info->data_len = ((SAMPLE *)snd_info->data_ptr)->len; + +#else /* AUDIO_UNIX_NATIVE */ if ((file = fopen(filename, MODE_READ)) == NULL) { @@ -1312,7 +1556,7 @@ static SoundInfo *Load_WAV(char *filename) } /* read chunk id "RIFF" */ - getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN); + getFileChunkLE(file, chunk_name, &chunk_size); if (strcmp(chunk_name, "RIFF") != 0) { Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); @@ -1322,7 +1566,7 @@ static SoundInfo *Load_WAV(char *filename) } /* read "RIFF" type id "WAVE" */ - getFileChunk(file, chunk_name, NULL, BYTE_ORDER_LITTLE_ENDIAN); + getFileChunkLE(file, chunk_name, NULL); if (strcmp(chunk_name, "WAVE") != 0) { Error(ERR_WARN, "missing 'WAVE' type ID of sound file '%s'", filename); @@ -1331,16 +1575,69 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } - while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN)) + while (getFileChunkLE(file, chunk_name, &chunk_size)) { if (strcmp(chunk_name, "fmt ") == 0) { - /* read header information */ - for (i=0; i < MIN(chunk_size, WAV_HEADER_SIZE); i++) - sound_header_buffer[i] = fgetc(file); + if (chunk_size < WAV_HEADER_SIZE) + { + Error(ERR_WARN, "sound file '%s': chunk 'fmt ' too short", filename); + fclose(file); + free(snd_info); + return NULL; + } + + header.compression_code = getFile16BitLE(file); + header.num_channels = getFile16BitLE(file); + header.sample_rate = getFile32BitLE(file); + header.bytes_per_second = getFile32BitLE(file); + header.block_align = getFile16BitLE(file); + header.bits_per_sample = getFile16BitLE(file); if (chunk_size > WAV_HEADER_SIZE) ReadUnusedBytesFromFile(file, chunk_size - WAV_HEADER_SIZE); + + if (header.compression_code != 1) + { + Error(ERR_WARN, "sound file '%s': compression code %d not supported", + filename, header.compression_code); + fclose(file); + free(snd_info); + return NULL; + } + + if (header.num_channels != 1) + { + Error(ERR_WARN, "sound file '%s': number of %d channels not supported", + filename, header.num_channels); + fclose(file); + free(snd_info); + return NULL; + } + + if (header.bits_per_sample != 8 && header.bits_per_sample != 16) + { + Error(ERR_WARN, "sound file '%s': %d bits per sample not supported", + filename, header.bits_per_sample); + fclose(file); + free(snd_info); + return NULL; + } + + /* warn, but accept wrong sample rate (may be only slightly different) */ + if (header.sample_rate != DEFAULT_AUDIO_SAMPLE_RATE) + Error(ERR_WARN, "sound file '%s': wrong sample rate %d instead of %d", + filename, header.sample_rate, DEFAULT_AUDIO_SAMPLE_RATE); + +#if 0 + printf("WAV file: '%s'\n", filename); + printf(" Compression code: %d'\n", header.compression_code); + printf(" Number of channels: %d'\n", header.num_channels); + printf(" Sample rate: %ld'\n", header.sample_rate); + printf(" Average bytes per second: %ld'\n", header.bytes_per_second); + printf(" Block align: %d'\n", header.block_align); + printf(" Significant bits per sample: %d'\n", header.bits_per_sample); +#endif } else if (strcmp(chunk_name, "data") == 0) { @@ -1375,9 +1672,15 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } - snd_info->format = AUDIO_FORMAT_U8; + if (header.bits_per_sample == 8) + snd_info->format = AUDIO_FORMAT_U8; + else /* header.bits_per_sample == 16 */ + { + snd_info->format = AUDIO_FORMAT_S16; + snd_info->data_len /= 2; /* correct number of samples */ + } -#endif /* PLATFORM_UNIX */ +#endif /* AUDIO_UNIX_NATIVE */ snd_info->type = SND_TYPE_WAV; snd_info->source_filename = getStringCopy(filename); @@ -1453,6 +1756,10 @@ static void LoadCustomSound(SoundInfo **snd_info, char *basename) { char *filename = getCustomSoundFilename(basename); +#if 0 + printf("GOT CUSTOM SOUND FILE '%s'\n", filename); +#endif + if (strcmp(basename, SND_FILE_UNDEFINED) == 0) { deleteSoundEntry(snd_info); @@ -1523,6 +1830,7 @@ static MusicInfo *Load_MOD(char *filename) void LoadCustomMusic(void) { + static boolean draw_init_text = TRUE; /* only draw at startup */ char *music_directory = getCustomMusicDirectory(); DIR *dir; struct dirent *dir_entry; @@ -1537,12 +1845,18 @@ void LoadCustomMusic(void) return; } + if (draw_init_text) + DrawInitText("Loading music:", 120, FC_GREEN); + while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ { char *basename = dir_entry->d_name; char *filename = getPath2(music_directory, basename); MusicInfo *mus_info = NULL; + if (draw_init_text) + DrawInitText(basename, 150, FC_YELLOW); + if (FileIsSound(basename)) mus_info = Load_WAV(filename); else if (FileIsMusic(basename)) @@ -1560,6 +1874,8 @@ void LoadCustomMusic(void) closedir(dir); + draw_init_text = FALSE; + if (num_music == 0) Error(ERR_WARN, "cannot find any valid music files in directory '%s'", music_directory); @@ -1570,49 +1886,30 @@ void PlayMusic(int nr) if (!audio.music_available) return; -#if defined(TARGET_SDL) - - nr = nr % num_music; - - if (Music[nr]->type == MUS_TYPE_MOD) - { - Mix_PlayMusic(Music[nr]->data_ptr, -1); - Mix_VolumeMusic(SOUND_MAX_VOLUME); /* must be _after_ Mix_PlayMusic()! */ - } - else /* play WAV music loop */ - { - Mix_Volume(audio.music_channel, SOUND_MAX_VOLUME); - Mix_PlayChannel(audio.music_channel, Music[nr]->data_ptr, -1); - } - -#else - PlaySoundMusic(nr); - -#endif } void PlaySound(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_SOUND); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_SOUND); } -void PlaySoundStereo(int nr, int stereo) +void PlaySoundStereo(int nr, int stereo_position) { - PlaySoundExt(nr, PSND_MAX_VOLUME, stereo, SND_CTRL_PLAY_SOUND); + PlaySoundExt(nr, SOUND_MAX_VOLUME, stereo_position, SND_CTRL_PLAY_SOUND); } void PlaySoundLoop(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_LOOP); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_LOOP); } void PlaySoundMusic(int nr) { - PlaySoundExt(nr, PSND_MAX_VOLUME, PSND_MIDDLE, SND_CTRL_PLAY_MUSIC); + PlaySoundExt(nr, SOUND_MAX_VOLUME, SOUND_MIDDLE, SND_CTRL_PLAY_MUSIC); } -void PlaySoundExt(int nr, int volume, int stereo, int state) +void PlaySoundExt(int nr, int volume, int stereo_position, int state) { SoundControl snd_ctrl; @@ -1621,36 +1918,31 @@ void PlaySoundExt(int nr, int volume, int stereo, int state) audio.sound_deactivated) return; - if (volume < PSND_MIN_VOLUME) - volume = PSND_MIN_VOLUME; - else if (volume > PSND_MAX_VOLUME) - volume = PSND_MAX_VOLUME; + if (volume < SOUND_MIN_VOLUME) + volume = SOUND_MIN_VOLUME; + else if (volume > SOUND_MAX_VOLUME) + volume = SOUND_MAX_VOLUME; - if (stereo < PSND_MAX_LEFT) - stereo = PSND_MAX_LEFT; - else if (stereo > PSND_MAX_RIGHT) - stereo = PSND_MAX_RIGHT; + if (stereo_position < SOUND_MAX_LEFT) + stereo_position = SOUND_MAX_LEFT; + else if (stereo_position > SOUND_MAX_RIGHT) + stereo_position = SOUND_MAX_RIGHT; snd_ctrl.active = TRUE; - snd_ctrl.nr = nr; + snd_ctrl.nr = nr; snd_ctrl.volume = volume; - snd_ctrl.stereo = stereo; - snd_ctrl.state = state; + snd_ctrl.stereo_position = stereo_position; + snd_ctrl.state = state; HandleSoundRequest(snd_ctrl); } void FadeMusic(void) { - if (!audio.sound_available) + if (!audio.music_available) return; -#if defined(TARGET_SDL) - Mix_FadeOutMusic(SOUND_FADING_INTERVAL); - Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); -#else StopSoundExt(-1, SND_CTRL_FADE_MUSIC); -#endif } void FadeSound(int nr) @@ -1666,15 +1958,10 @@ void FadeSounds() void StopMusic(void) { -#if defined(TARGET_SDL) - if (!audio.sound_available) + if (!audio.music_available) return; - Mix_HaltMusic(); - Mix_HaltChannel(audio.music_channel); -#else StopSoundExt(-1, SND_CTRL_STOP_MUSIC); -#endif } void StopSound(int nr) @@ -1696,8 +1983,8 @@ void StopSoundExt(int nr, int state) return; snd_ctrl.active = FALSE; - snd_ctrl.nr = nr; - snd_ctrl.state = state; + snd_ctrl.nr = nr; + snd_ctrl.state = state; HandleSoundRequest(snd_ctrl); } @@ -1783,6 +2070,10 @@ static void LoadSoundsInfo() struct SetupFileList *setup_file_list; int i; +#if 0 + printf("GOT CUSTOM SOUND CONFIG FILE '%s'\n", filename); +#endif + /* always start with reliable default values */ for (i=0; idata_ptr); #elif defined(TARGET_ALLEGRO) destroy_sample(sound->data_ptr); -#else /* PLATFORM_UNIX */ +#else /* AUDIO_UNIX_NATIVE */ free(sound->data_ptr); #endif } @@ -1915,7 +2215,7 @@ void FreeMusic(MusicInfo *music) Mix_FreeChunk(music->data_ptr); #elif defined(TARGET_ALLEGRO) destroy_sample(music->data_ptr); -#else /* PLATFORM_UNIX */ +#else /* AUDIO_UNIX_NATIVE */ free(music->data_ptr); #endif } @@ -1930,8 +2230,10 @@ void FreeAllSounds() if (Sound == NULL) return; +#if 0 printf("%s: FREEING SOUNDS ...\n", IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT"); +#endif for(i=0; i