X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=a242713161fd2dd111f19257c8078a76f414ccdf;hb=87f531efe267aa3d6a27cc3a68c68c1a4df7b18b;hp=414ab122befa69174fd501a16ec44763f0a41797;hpb=86e110774e5210b326e6867b134bd638d93554d3;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 414ab122..a2427131 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -1,7 +1,7 @@ /*********************************************************** * Artsoft Retro-Game Library * *----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * +* (c) 1994-2002 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -11,8 +11,9 @@ * sound.c * ***********************************************************/ -#include +#include #include +#include #include #include #include @@ -65,6 +66,7 @@ #define MUS_TYPE_MOD 2 #define DEVICENAME_DSP "/dev/dsp" +#define DEVICENAME_SOUND_DSP "/dev/sound/dsp" #define DEVICENAME_AUDIO "/dev/audio" #define DEVICENAME_AUDIOCTL "/dev/audioCtl" @@ -233,6 +235,7 @@ static boolean TestAudioDevices(void) static char *audio_device_name[] = { DEVICENAME_DSP, + DEVICENAME_SOUND_DSP, DEVICENAME_AUDIO }; int audio_device_fd = -1; @@ -270,6 +273,12 @@ static boolean ForkAudioProcess(void) return FALSE; } +#if 0 + printf("PID: %d [%s]\n", getpid(), + (IS_CHILD_PROCESS(audio.mixer_pid) ? "child" : "parent")); + Delay(10000 * 0); +#endif + if (IS_CHILD_PROCESS(audio.mixer_pid)) Mixer_Main(); /* this function never returns */ else @@ -349,7 +358,7 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) 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"); + "cannot set fragment size of audio device -- no sounds"); i = 0; afmt->format = 0; @@ -365,7 +374,7 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) if (afmt->format == 0) /* no supported audio format found */ Error(ERR_EXIT_SOUND_SERVER, - "cannot set audio format of /dev/dsp -- no sounds"); + "cannot set audio format of audio device -- no sounds"); /* try if we can use stereo sound */ afmt->stereo = TRUE; @@ -374,15 +383,15 @@ static void InitAudioDevice_Linux(struct AudioFormatInfo *afmt) 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"); + "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 /dev/dsp -- no sounds"); + "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 /dev/dsp -- no sounds"); + "cannot set fragment size of audio device -- no sounds"); } #endif /* AUDIO_LINUX_IOCTL */ @@ -396,8 +405,8 @@ static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) 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; + a_info.play.sample_rate = afmt->sample_rate; + a_info.blocksize = afmt->fragment_size; afmt->format = AUDIO_FORMAT_U8; afmt->stereo = TRUE; @@ -411,7 +420,7 @@ static void InitAudioDevice_NetBSD(struct AudioFormatInfo *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"); + "cannot set sample rate of audio device -- no sounds"); } } #endif /* PLATFORM_NETBSD */ @@ -424,7 +433,7 @@ static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) audio_ctl = open("/dev/audioCtl", O_WRONLY | O_NDELAY); if (audio_ctl == -1) - Error(ERR_EXIT_SOUND_SERVER, "cannot open /dev/audioCtl -- no sounds"); + 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"); @@ -489,14 +498,19 @@ static void ReadSoundControlFromMainProcess(SoundControl *snd_ctrl) Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); } -static void WriteReloadInfoToPipe(char *set_name, int type) +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 long str_size1 = strlen(leveldir_current->fullpath) + 1; - unsigned long str_size2 = strlen(ti->basepath) + 1; - unsigned long str_size3 = strlen(ti->fullpath) + 1; + unsigned long str_size2 = strlen(leveldir_current->sounds_path) + 1; + unsigned long str_size3 = strlen(leveldir_current->music_path) + 1; + unsigned long str_size4 = strlen(ti->basepath) + 1; + unsigned long str_size5 = strlen(ti->fullpath) + 1; + boolean override_level_artwork = (type == SND_CTRL_RELOAD_SOUNDS ? + setup.override_level_sounds : + setup.override_level_music); if (IS_CHILD_PROCESS(audio.mixer_pid)) return; @@ -506,12 +520,14 @@ static void WriteReloadInfoToPipe(char *set_name, int type) snd_ctrl.active = FALSE; snd_ctrl.state = type; - snd_ctrl.data_len = strlen(set_name) + 1; + snd_ctrl.data_len = strlen(set_identifier) + 1; if (write(audio.mixer_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0 || - write(audio.mixer_pipe[1], set_name, + write(audio.mixer_pipe[1], set_identifier, snd_ctrl.data_len) < 0 || + write(audio.mixer_pipe[1], &override_level_artwork, + sizeof(boolean)) < 0 || write(audio.mixer_pipe[1], leveldir_current, sizeof(TreeInfo)) < 0 || write(audio.mixer_pipe[1], ti, @@ -522,12 +538,20 @@ static void WriteReloadInfoToPipe(char *set_name, int type) sizeof(unsigned long)) < 0 || write(audio.mixer_pipe[1], &str_size3, sizeof(unsigned long)) < 0 || + write(audio.mixer_pipe[1], &str_size4, + sizeof(unsigned long)) < 0 || + write(audio.mixer_pipe[1], &str_size5, + sizeof(unsigned long)) < 0 || write(audio.mixer_pipe[1], leveldir_current->fullpath, str_size1) < 0 || - write(audio.mixer_pipe[1], ti->basepath, + write(audio.mixer_pipe[1], leveldir_current->sounds_path, str_size2) < 0 || + write(audio.mixer_pipe[1], leveldir_current->music_path, + str_size3) < 0 || + write(audio.mixer_pipe[1], ti->basepath, + str_size4) < 0 || write(audio.mixer_pipe[1], ti->fullpath, - str_size3) < 0) + str_size5) < 0) { Error(ERR_WARN, "cannot pipe to child process -- no sounds"); audio.sound_available = audio.sound_enabled = FALSE; @@ -540,27 +564,37 @@ 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 long str_size1, str_size2, str_size3; - static char *set_name = NULL; + unsigned long str_size1, str_size2, str_size3, str_size4, str_size5; + static char *set_identifier = NULL; + boolean *override_level_artwork = (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS ? + &setup.override_level_sounds : + &setup.override_level_music); - if (set_name) - free(set_name); + if (set_identifier) + free(set_identifier); - set_name = checked_malloc(snd_ctrl->data_len); + set_identifier = checked_malloc(snd_ctrl->data_len); if (leveldir_current == NULL) leveldir_current = checked_calloc(sizeof(TreeInfo)); + if (ti == NULL) ti = *ti_ptr = checked_calloc(sizeof(TreeInfo)); if (leveldir_current->fullpath != NULL) free(leveldir_current->fullpath); + if (leveldir_current->sounds_path != NULL) + free(leveldir_current->sounds_path); + if (leveldir_current->music_path != NULL) + free(leveldir_current->music_path); if (ti->basepath != NULL) free(ti->basepath); if (ti->fullpath != NULL) free(ti->fullpath); - if (read(audio.mixer_pipe[0], set_name, + 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, @@ -570,25 +604,35 @@ static void ReadReloadInfoFromPipe(SoundControl *snd_ctrl) read(audio.mixer_pipe[0], &str_size2, sizeof(unsigned long)) != sizeof(unsigned long) || read(audio.mixer_pipe[0], &str_size3, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.mixer_pipe[0], &str_size4, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.mixer_pipe[0], &str_size5, sizeof(unsigned long)) != sizeof(unsigned long)) Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); leveldir_current->fullpath = checked_calloc(str_size1); - ti->basepath = checked_calloc(str_size2); - ti->fullpath = checked_calloc(str_size3); + leveldir_current->sounds_path = checked_calloc(str_size2); + leveldir_current->music_path = checked_calloc(str_size3); + ti->basepath = checked_calloc(str_size4); + ti->fullpath = checked_calloc(str_size5); if (read(audio.mixer_pipe[0], leveldir_current->fullpath, str_size1) != str_size1 || - read(audio.mixer_pipe[0], ti->basepath, + read(audio.mixer_pipe[0], leveldir_current->sounds_path, str_size2) != str_size2 || + read(audio.mixer_pipe[0], leveldir_current->music_path, + str_size3) != str_size3 || + read(audio.mixer_pipe[0], ti->basepath, + str_size4) != str_size4 || read(audio.mixer_pipe[0], ti->fullpath, - str_size3) != str_size3) + str_size5) != str_size5) Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); if (snd_ctrl->state & SND_CTRL_RELOAD_SOUNDS) - artwork.sounds_set_current = set_name; + artwork.snd_current_identifier = set_identifier; else - artwork.music_set_current = set_name; + artwork.mus_current_identifier = set_identifier; } #endif /* AUDIO_UNIX_NATIVE */ @@ -792,15 +836,17 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) int i, k; #if 0 - printf("NEW SOUND %d HAS ARRIVED [%d]\n", snd_ctrl.nr, num_sounds); -#endif - -#if 0 - printf("%d ACTIVE CHANNELS\n", mixer_active_channels); + printf("NEW SOUND %d ARRIVED [%d] [%d ACTIVE CHANNELS]\n", + snd_ctrl.nr, num_sounds, mixer_active_channels); #endif if (IS_MUSIC(snd_ctrl)) + { + if (num_music == 0) + return; + snd_ctrl.nr = snd_ctrl.nr % num_music; + } else if (snd_ctrl.nr >= num_sounds) return; @@ -817,10 +863,7 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) /* play music samples on a dedicated music channel */ if (IS_MUSIC(snd_ctrl)) { -#if 0 - printf("PLAY MUSIC WITH VOLUME/STEREO %d/%d\n", - snd_ctrl.volume, snd_ctrl.stereo_position); -#endif + Mixer_StopMusicChannel(); mixer[audio.music_channel] = snd_ctrl; Mixer_PlayMusicChannel(); @@ -905,12 +948,36 @@ static void Mixer_InsertSound(SoundControl snd_ctrl) of the channel's sound sample when compiling with the SDL mixer library, we use the current playing time (in milliseconds) instead. */ +#if DEBUG + /* channel allocation sanity check -- should not be needed */ + if (mixer_active_channels == + audio.num_channels - (mixer[audio.music_channel].active ? 0 : 1)) + { + for (i=audio.first_sound_channel; 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) - { - printf("THIS SHOULD NEVER HAPPEN! [adding music twice]\n"); - -#if 1 - Mixer_StopChannel(i); -#endif - } -#endif mixer[i] = snd_ctrl; Mixer_PlayChannel(i); @@ -1289,7 +1338,7 @@ static int Mixer_Main_SimpleAudio(SoundControl snd_ctrl) mixer[i].volume * (long)premix_first_buffer[j] / SOUND_MAX_VOLUME; /* might be needed for u-law /dev/audio */ -#if 0 +#if 1 for(j=0; j