X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=658a67efbdd45ab80296d67f767a65d80053fe69;hb=8ae353be22bec6faaa68b978e188f5c15120e44b;hp=00019c6e3e5cc12a1c10e4c3be03ef2c6e692bb2;hpb=1085cba858dc9cccaa5da434ddb990de23fffdfc;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 00019c6e..658a67ef 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -24,6 +24,9 @@ #include "setup.h" +#define IS_PARENT_PROCESS(pid) ((pid) > 0) +#define IS_CHILD_PROCESS(pid) ((pid) == 0) + struct ListNode { char *key; @@ -49,31 +52,30 @@ static int num_sounds = 0, num_music = 0; /* ========================================================================= */ /* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ -static struct AudioFormatInfo afmt; static struct SoundControl mixer[NUM_MIXER_CHANNELS]; static int mixer_active_channels = 0; -/* forward declaration of internal functions */ -static void Mixer_Main(void); -static void Mixer_InsertNewSound(struct SoundControl); -static void InitAudioDevice(struct AudioFormatInfo *); +#if defined(AUDIO_UNIX_NATIVE) +static struct AudioFormatInfo afmt; -#if defined(PLATFORM_UNIX) +static void Mixer_Main(void); #if !defined(AUDIO_STREAMING_DSP) static unsigned char linear_to_ulaw(int); static int ulaw_to_linear(unsigned char); #endif -#elif defined(PLATFORM_MSDOS) -static void Mixer_InsertNewSound(struct SoundControl); -static void Mixer_StopSound(struct SoundControl); -static void Mixer_StopAllSounds(); #endif static void ReloadCustomSounds(); static void ReloadCustomMusic(); static void FreeSound(void *); -#if defined(PLATFORM_UNIX) + +/* ------------------------------------------------------------------------- */ +/* functions for native (non-SDL) Unix audio/mixer support */ +/* ------------------------------------------------------------------------- */ + +#if defined(AUDIO_UNIX_NATIVE) + static int OpenAudioDevice(char *audio_device_name) { int audio_device_fd; @@ -130,7 +132,6 @@ static boolean TestAudioDevices(void) return TRUE; } -#if !defined(TARGET_SDL) static boolean ForkAudioProcess(void) { if (pipe(audio.mixer_pipe) < 0) @@ -145,19 +146,13 @@ static boolean ForkAudioProcess(void) return FALSE; } - if (audio.mixer_pid == 0) /* we are child process */ - { - Mixer_Main(); - - /* never reached */ - exit(0); - } - else /* we are parent */ - close(audio.mixer_pipe[0]); /* no reading from pipe needed */ + if (IS_CHILD_PROCESS(audio.mixer_pid)) + Mixer_Main(); /* this function never returns */ + else + close(audio.mixer_pipe[0]); /* no reading from pipe needed */ return TRUE; } -#endif void UnixOpenAudio(void) { @@ -182,20 +177,204 @@ void UnixCloseAudio(void) if (audio.device_fd) close(audio.device_fd); - if (audio.mixer_pid > 0) /* we are parent process */ + if (IS_PARENT_PROCESS(audio.mixer_pid)) kill(audio.mixer_pid, SIGTERM); } + +/* ------------------------------------------------------------------------- */ +/* 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)) + return; + + if (write(audio.mixer_pipe[1], snd_ctrl, sizeof(SoundControl)) < 0) + { + Error(ERR_WARN, "cannot pipe to child process -- no sounds"); + audio.sound_available = audio.sound_enabled = FALSE; + return; + } +} + +static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl) +{ + if (IS_PARENT_PROCESS(audio.mixer_pid)) + return; + + if (read(audio.mixer_pipe[0], snd_ctrl, sizeof(SoundControl)) + != sizeof(SoundControl)) + Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); +} + static void WriteReloadInfoToPipe(char *set_name, int type) { - struct SoundControl snd_ctrl; + SoundControl snd_ctrl; TreeInfo *ti = (type == SND_CTRL_RELOAD_SOUNDS ? artwork.snd_current : artwork.mus_current); unsigned long str_size1 = strlen(leveldir_current->fullpath) + 1; unsigned long str_size2 = strlen(ti->basepath) + 1; unsigned long str_size3 = strlen(ti->fullpath) + 1; - if (audio.mixer_pid == 0) /* we are child process */ + if (IS_CHILD_PROCESS(audio.mixer_pid)) return; if (leveldir_current == NULL) /* should never happen */ @@ -232,9 +411,9 @@ static void WriteReloadInfoToPipe(char *set_name, int type) } } -static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl) +static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) { - TreeInfo **ti_ptr = ((snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) ? + TreeInfo **ti_ptr = ((snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) ? &artwork.snd_current : &artwork.mus_current); TreeInfo *ti = *ti_ptr; unsigned long str_size1, str_size2, str_size3; @@ -243,7 +422,7 @@ static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl) if (set_name) free(set_name); - set_name = checked_malloc(snd_ctrl.data_len); + set_name = checked_malloc(snd_ctrl->data_len); if (leveldir_current == NULL) leveldir_current = checked_calloc(sizeof(TreeInfo)); @@ -257,7 +436,7 @@ static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl) free(ti->fullpath); if (read(audio.mixer_pipe[0], set_name, - snd_ctrl.data_len) != snd_ctrl.data_len || + snd_ctrl->data_len) != snd_ctrl->data_len || read(audio.mixer_pipe[0], leveldir_current, sizeof(TreeInfo)) != sizeof(TreeInfo) || read(audio.mixer_pipe[0], ti, @@ -282,12 +461,18 @@ static void ReadReloadInfoFromPipe(struct SoundControl snd_ctrl) str_size3) != str_size3) Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); - if (snd_ctrl.state & SND_CTRL_RELOAD_SOUNDS) + if (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) artwork.sounds_set_current = set_name; else artwork.music_set_current = set_name; } -#endif /* PLATFORM_UNIX */ + +#endif /* AUDIO_UNIX_NATIVE */ + + +/* ------------------------------------------------------------------------- */ +/* mixer functions */ +/* ------------------------------------------------------------------------- */ void Mixer_InitChannels() { @@ -298,25 +483,116 @@ void Mixer_InitChannels() mixer_active_channels = 0; } -static void Mixer_FadeSound(int channel) +static void Mixer_PlayChannel(int channel) { - mixer[channel].state |= SND_CTRL_FADE; + /* start with inactive channel in case something goes wrong */ + mixer[channel].active = FALSE; + + if (mixer[channel].type != MUS_TYPE_WAV) + return; + + mixer[channel].playingpos = 0; + mixer[channel].playingtime = 0; + +#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) + mixer[channel].voice = allocate_voice((SAMPLE *)mixer[channel].data_ptr); + if (mixer[channel].voice < 0) + return; + + 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 + + mixer[channel].active = TRUE; + mixer_active_channels++; +} + +static void Mixer_PlayMusicChannel() +{ + Mixer_PlayChannel(audio.music_channel); + +#if defined(TARGET_SDL) + if (mixer[audio.music_channel].type != MUS_TYPE_WAV) + { + /* Mix_VolumeMusic() must be called _after_ Mix_PlayMusic() -- + this looks like a bug in the SDL_mixer library */ + Mix_PlayMusic(mixer[audio.music_channel].data_ptr, -1); + Mix_VolumeMusic(SOUND_MAX_VOLUME); + } +#endif } -static void Mixer_RemoveSound(int channel) +static void Mixer_StopChannel(int channel) { +#if 0 +#if defined(TARGET_SDL) + printf("----------> %d [%d]\n", Mix_Playing(channel), Mix_Playing(0)); +#endif +#endif + if (!mixer_active_channels || !mixer[channel].active) return; -#if 0 - printf("REMOVING MIXER SOUND %d\n", channel); +#if defined(TARGET_SDL) + Mix_HaltChannel(channel); +#elif defined(PLATFORM_MSDOS) + voice_set_volume(mixer[channel].voice, 0); + deallocate_voice(mixer[channel].voice); #endif mixer[channel].active = FALSE; mixer_active_channels--; } -static void Mixer_InsertSound(struct SoundControl snd_ctrl) +static void Mixer_StopMusicChannel() +{ + Mixer_StopChannel(audio.music_channel); + +#if defined(TARGET_SDL) + Mix_HaltMusic(); +#endif +} + +static void Mixer_FadeChannel(int channel) +{ + if (!mixer_active_channels || !mixer[channel].active) + return; + + mixer[channel].state |= SND_CTRL_FADE; + +#if defined(TARGET_SDL) + +#if 1 + Mix_FadeOutChannel(channel, SOUND_FADING_INTERVAL); +#else + Mix_ExpireChannel(channel, SOUND_FADING_INTERVAL); +#endif + +#elif defined(PLATFORM_MSDOS) + if (voice_check(mixer[channel].voice)) + voice_ramp_volume(mixer[channel].voice, SOUND_FADING_INTERVAL, 0); + mixer[channel].state &= ~SND_CTRL_IS_LOOP; +#endif +} + +static void Mixer_FadeMusicChannel() +{ + Mixer_FadeChannel(audio.music_channel); + +#if defined(TARGET_SDL) + Mix_FadeOutMusic(SOUND_FADING_INTERVAL); +#endif +} + +static void Mixer_InsertSound(SoundControl snd_ctrl) { SoundInfo *snd_info; int i, k; @@ -332,44 +608,51 @@ static void Mixer_InsertSound(struct SoundControl snd_ctrl) snd_info = (IS_MUSIC(snd_ctrl) ? Music[snd_ctrl.nr] : Sound[snd_ctrl.nr]); if (snd_info == NULL) + return; + + /* copy sound sample and format information */ + snd_ctrl.type = snd_info->type; + snd_ctrl.format = snd_info->format; + snd_ctrl.data_ptr = snd_info->data_ptr; + snd_ctrl.data_len = snd_info->data_len; + + /* play music samples on a dedicated music channel */ + if (IS_MUSIC(snd_ctrl)) { -#if 0 - printf("sound/music %d undefined\n", snd_ctrl.nr); -#endif + mixer[audio.music_channel] = snd_ctrl; + Mixer_PlayMusicChannel(); + return; } -#if 0 - printf("-> %d\n", mixer_active_channels); -#endif - if (mixer_active_channels == audio.num_channels) { for (i=0; i longest) { @@ -377,11 +660,8 @@ static void Mixer_InsertSound(struct SoundControl snd_ctrl) longest_nr = i; } } -#if defined(PLATFORM_MSDOS) - voice_set_volume(mixer[longest_nr].voice, 0); - deallocate_voice(mixer[longest_nr].voice); -#endif - Mixer_RemoveSound(longest_nr); + + Mixer_StopChannel(longest_nr); } /* check if sound is already being played (and how often) */ @@ -422,11 +702,8 @@ static void Mixer_InsertSound(struct SoundControl snd_ctrl) if (!mixer[i].active || mixer[i].nr != snd_ctrl.nr) continue; -#if !defined(PLATFORM_MSDOS) actual = 100 * mixer[i].playingpos / mixer[i].data_len; -#else - actual = mixer[i].playingpos; -#endif + if (actual >= longest) { longest = actual; @@ -434,11 +711,7 @@ static void Mixer_InsertSound(struct SoundControl snd_ctrl) } } -#if defined(PLATFORM_MSDOS) - voice_set_volume(mixer[longest_nr].voice, 0); - deallocate_voice(mixer[longest_nr].voice); -#endif - Mixer_RemoveSound(longest_nr); + Mixer_StopChannel(longest_nr); } /* add new sound to mixer */ @@ -455,19 +728,18 @@ static void Mixer_InsertSound(struct SoundControl snd_ctrl) if ((i == audio.music_channel && IS_MUSIC(snd_ctrl)) || (i != audio.music_channel && !mixer[i].active)) { - snd_ctrl.data_ptr = snd_info->data_ptr; - snd_ctrl.data_len = snd_info->data_len; - snd_ctrl.format = snd_info->format; - - snd_ctrl.playingpos = 0; - snd_ctrl.playingtime = 0; +#if 0 + printf("ADDING NEW SOUND %d TO MIXER\n", snd_ctrl.nr); +#endif #if 1 +#if defined(AUDIO_UNIX_NATIVE) if (snd_info->data_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) @@ -475,42 +747,57 @@ static void Mixer_InsertSound(struct SoundControl snd_ctrl) printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n"); #if 1 - Mixer_RemoveSound(i); + Mixer_StopChannel(i); #endif } #endif mixer[i] = snd_ctrl; - mixer_active_channels++; - -#if 0 - printf("NEW SOUND %d ADDED TO MIXER\n", snd_ctrl.nr); -#endif + Mixer_PlayChannel(i); -#if defined(PLATFORM_MSDOS) - mixer[i].voice = allocate_voice((SAMPLE *)mixer[i].data_ptr); - - if (snd_ctrl.loop) - voice_set_playmode(mixer[i].voice, PLAYMODE_LOOP); - - voice_set_volume(mixer[i].voice, snd_ctrl.volume); - voice_set_pan(mixer[i].voice, snd_ctrl.stereo); - voice_start(mixer[i].voice); -#endif break; } } } -static void HandleSoundRequest(struct SoundControl snd_ctrl) +static void HandleSoundRequest(SoundControl snd_ctrl) { int i; +#if defined(AUDIO_UNIX_NATIVE) + if (IS_PARENT_PROCESS(audio.mixer_pid)) + { + SendSoundControlToMixerProcess(&snd_ctrl); + return; + } +#elif defined(TARGET_SDL) + for (i=0; imajor, + link_version->minor, + link_version->patch); +#endif + if (!audio.sound_available) return; -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) +#if defined(AUDIO_UNIX_NATIVE) if (!ForkAudioProcess()) audio.sound_available = FALSE; #endif } -#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) +#if defined(AUDIO_UNIX_NATIVE) -static void CopySampleToMixingBuffer(struct SoundControl *snd_ctrl, +static void CopySampleToMixingBuffer(SoundControl *snd_ctrl, int sample_pos, int sample_size, short *buffer_ptr) { @@ -718,10 +1022,10 @@ static void Mixer_Main_DSP() if (IS_LOOP(mixer[i])) mixer[i].playingpos = 0; else - Mixer_RemoveSound(i); + Mixer_StopChannel(i); } else if (mixer[i].volume <= SOUND_FADING_VOLUME_THRESHOLD) - Mixer_RemoveSound(i); + Mixer_StopChannel(i); } /* prepare final playing buffer according to system audio format */ @@ -761,7 +1065,7 @@ static void Mixer_Main_DSP() #else /* !AUDIO_STREAMING_DSP */ -static int Mixer_Main_SimpleAudio(struct SoundControl snd_ctrl) +static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl) { static short premix_first_buffer[SND_BLOCKSIZE]; static byte playing_buffer[SND_BLOCKSIZE]; @@ -789,400 +1093,108 @@ static int Mixer_Main_SimpleAudio(struct SoundControl snd_ctrl) if (mixer[i].volume != PSND_MAX_VOLUME) for(j=0; j> PSND_MAX_VOLUME_BITS; - - /* might be needed for u-law /dev/audio */ -#if 0 - for(j=0; j= mixer[i].data_len) - Mixer_RemoveSound(i); - - for(i=0; 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() -{ - struct 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; - if (read(audio.mixer_pipe[0], &snd_ctrl, sizeof(snd_ctrl)) - != sizeof(snd_ctrl)) - Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); - - 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 /* PLATFORM_UNIX */ - -#if defined(PLATFORM_MSDOS) -static void sound_handler(struct SoundControl snd_ctrl) -{ - int i; - - if (snd_ctrl.fade_sound) - { - if (!mixer_active_channels) - return; - - for (i=0; i> PSND_MAX_VOLUME_BITS; - for(i=0; i= mixer[i].data_len) + Mixer_StopChannel(i); + for(i=0; i> 8) ^ 0x80; -/* ------------------------------------------------------------------------- */ -/* platform dependant audio initialization code */ -/* ------------------------------------------------------------------------- */ + /* finally play the sound fragment */ + write(audio.device_fd, playing_buffer, sample_size); -#if defined(AUDIO_LINUX_IOCTL) -static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) + return sample_size; +} +#endif /* !AUDIO_STREAMING_DSP */ + +void Mixer_Main() { - /* "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; + SoundControl snd_ctrl; + fd_set mixer_fdset; - /* determine logarithm (log2) of the fragment size */ - while ((1 << fragment_spec) < afmt->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); - i = 0; - afmt->format = 0; - while (formats[i].format_result != -1) + while(1) /* wait for sound playing commands from client */ { - 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; - } - } + struct timeval delay = { 0, 0 }; - if (afmt->format == 0) /* no supported audio format found */ - Error(ERR_EXIT_SOUND_SERVER, - "cannot set audio format of /dev/dsp -- no sounds"); + 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; - /* try if we can use stereo sound */ - afmt->stereo = TRUE; - if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) - afmt->stereo = FALSE; + ReadSoundControlFromMainProcess(&snd_ctrl); - 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"); + HandleSoundRequest(snd_ctrl); - /* 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(AUDIO_STREAMING_DSP) -#if defined(PLATFORM_NETBSD) -static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) -{ - 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(); + } - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = TRUE; +#else /* !AUDIO_STREAMING_DSP */ - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - { - /* try to disable stereo */ - a_info.play.channels = 1; + if (!snd_ctrl.active || IS_LOOP(snd_ctrl) || + (audio.device_fd = OpenAudioDevice(audio.device_name)) < 0) + continue; - afmt->stereo = FALSE; + InitAudioDevice(&afmt); - if (ioctl(audio.device_fd, AUDIO_SETINFO, &a_info) < 0) - Error(ERR_EXIT_SOUND_SERVER, - "cannot set sample rate of /dev/audio -- no sounds"); - } -} -#endif /* PLATFORM_NETBSD */ + delay.tv_sec = 0; + delay.tv_usec = 0; -#if defined(PLATFORM_HPUX) -static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) -{ - struct audio_describe ainfo; - int audio_ctl; + 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; - audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); - if (audio_ctl == -1) - Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); + FD_SET(audio.mixer_pipe[0], &mixer_fdset); - if (ioctl(audio_ctl, AUDIO_DESCRIBE, &ainfo) == -1) - Error(ERR_EXIT_SOUND_SERVER, "no audio info -- no sounds"); + sample_size = Mixer_Main_SimpleAudio(snd_ctrl); - if (ioctl(audio_ctl, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) == -1) - Error(ERR_EXIT_SOUND_SERVER, "ulaw audio not available -- no sounds"); + delay.tv_sec = 0; + delay.tv_usec = + ((sample_size * 10 * wait_percent) / afmt.sample_rate) * 1000; + } - ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); - ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); + CloseAudioDevice(&audio.device_fd); - afmt->format = AUDIO_FORMAT_U8; - afmt->stereo = FALSE; - afmt->sample_rate = 8000; + Mixer_InitChannels(); /* remove all sounds from mixer */ - close(audio_ctl); +#endif /* !AUDIO_STREAMING_DSP */ + } } -#endif /* PLATFORM_HPUX */ - -#if defined(PLATFORM_UNIX) -static void InitAudioDevice(struct AudioFormatInfo *afmt) -{ - afmt->stereo = TRUE; - afmt->format = AUDIO_FORMAT_UNKNOWN; - afmt->sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; - afmt->fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; +#endif /* AUDIO_UNIX_NATIVE */ -#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"... :) */ @@ -1287,7 +1299,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 */ @@ -1326,6 +1338,8 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } + snd_info->data_len = ((Mix_Chunk *)snd_info->data_ptr)->alen; + #elif defined(TARGET_ALLEGRO) if ((snd_info->data_ptr = load_sample(filename)) == NULL) @@ -1335,7 +1349,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) { @@ -1410,7 +1426,7 @@ static SoundInfo *Load_WAV(char *filename) snd_info->format = AUDIO_FORMAT_U8; -#endif /* PLATFORM_UNIX */ +#endif /* AUDIO_UNIX_NATIVE */ snd_info->type = SND_TYPE_WAV; snd_info->source_filename = getStringCopy(filename); @@ -1603,26 +1619,7 @@ 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) @@ -1647,7 +1644,7 @@ void PlaySoundMusic(int nr) void PlaySoundExt(int nr, int volume, int stereo, int state) { - struct SoundControl snd_ctrl; + SoundControl snd_ctrl; if (!audio.sound_available || !audio.sound_enabled || @@ -1670,25 +1667,7 @@ void PlaySoundExt(int nr, int volume, int stereo, int state) snd_ctrl.stereo = stereo; snd_ctrl.state = state; -#if defined(TARGET_SDL) - if (Sound[nr]) - { - Mix_Volume(-1, SOUND_MAX_VOLUME); - Mix_PlayChannel(-1, Sound[nr]->data_ptr, (state & SND_CTRL_LOOP ? -1 : 0)); - } -#elif defined(PLATFORM_UNIX) - if (audio.mixer_pid == 0) /* we are child process */ - return; - - if (write(audio.mixer_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0) - { - Error(ERR_WARN, "cannot pipe to child process -- no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; - return; - } -#elif defined(PLATFORM_MSDOS) - sound_handler(snd_ctrl); -#endif + HandleSoundRequest(snd_ctrl); } void FadeMusic(void) @@ -1696,12 +1675,7 @@ void FadeMusic(void) if (!audio.sound_available) return; -#if defined(TARGET_SDL) - Mix_FadeOutMusic(SOUND_FADING_INTERVAL); - Mix_FadeOutChannel(audio.music_channel, SOUND_FADING_INTERVAL); -#else StopSoundExt(-1, SND_CTRL_FADE_MUSIC); -#endif } void FadeSound(int nr) @@ -1717,15 +1691,10 @@ void FadeSounds() void StopMusic(void) { -#if defined(TARGET_SDL) - if (!audio.sound_available) + if (!audio.music_available) return; - Mix_HaltMusic(); - Mix_HaltChannel(audio.music_channel); -#else StopSoundExt(-1, SND_CTRL_STOP_MUSIC); -#endif } void StopSound(int nr) @@ -1741,7 +1710,7 @@ void StopSounds() void StopSoundExt(int nr, int state) { - struct SoundControl snd_ctrl; + SoundControl snd_ctrl; if (!audio.sound_available) return; @@ -1750,47 +1719,7 @@ void StopSoundExt(int nr, int state) snd_ctrl.nr = nr; snd_ctrl.state = state; -#if defined(TARGET_SDL) - - if (state & SND_CTRL_FADE) - { - int i; - - /* - for (i=audio.first_sound_channel; idata_ptr); #elif defined(TARGET_ALLEGRO) destroy_sample(sound->data_ptr); -#else /* PLATFORM_UNIX */ +#else /* AUDIO_UNIX_NATIVE */ free(sound->data_ptr); #endif } @@ -2006,7 +1935,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 } @@ -2022,7 +1951,7 @@ void FreeAllSounds() return; printf("%s: FREEING SOUNDS ...\n", - audio.mixer_pid == 0 ? "CHILD" : "PARENT"); + IS_CHILD_PROCESS(audio.mixer_pid) ? "CHILD" : "PARENT"); for(i=0; i