X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=20a1978ee4465d7e108d96c84a90a2cc8bacb9ec;hb=19db00ff98326cb4b92cea42080d7094e0842243;hp=744c4bd8900c0aaa0947b0a1ac64d42126f494ca;hpb=1101077a226b09854650662759bf12caf7c84f8d;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 744c4bd8..20a1978e 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -32,6 +32,11 @@ static int num_sounds = 0, num_music = 0; /* ========================================================================= */ /* THE STUFF BELOW IS ONLY USED BY THE SOUND SERVER CHILD PROCESS */ +static struct AudioFormatInfo afmt = +{ + TRUE, 0, DEFAULT_AUDIO_SAMPLE_RATE, DEFAULT_AUDIO_FRAGMENT_SIZE +}; + static int playing_sounds = 0; static struct SoundControl playlist[MAX_SOUNDS_PLAYING]; static struct SoundControl emptySoundControl = @@ -40,33 +45,28 @@ static struct SoundControl emptySoundControl = }; #if defined(PLATFORM_UNIX) -static int stereo_volume[PSND_MAX_LEFT2RIGHT+1]; -static char premix_first_buffer[SND_BLOCKSIZE]; +static int stereo_volume[PSND_MAX_LEFT2RIGHT + 1]; +static short premix_first_buffer[SND_BLOCKSIZE]; #if defined(AUDIO_STREAMING_DSP) -static char premix_left_buffer[SND_BLOCKSIZE]; -static char premix_right_buffer[SND_BLOCKSIZE]; -static int premix_last_buffer[SND_BLOCKSIZE]; +static short premix_left_buffer[SND_BLOCKSIZE]; +static short premix_right_buffer[SND_BLOCKSIZE]; +static long premix_last_buffer[SND_BLOCKSIZE]; #endif -static unsigned char playing_buffer[SND_BLOCKSIZE]; +static byte playing_buffer[SND_BLOCKSIZE]; #endif /* forward declaration of internal functions */ #if defined(AUDIO_STREAMING_DSP) static void SoundServer_InsertNewSound(struct SoundControl); +static void InitAudioDevice_DSP(struct AudioFormatInfo *); +#elif defined(PLATFORM_HPUX) +static void InitAudioDevice_HPUX(struct AudioFormatInfo *); #elif defined(PLATFORM_UNIX) static unsigned char linear_to_ulaw(int); static int ulaw_to_linear(unsigned char); -#endif - -#if defined(AUDIO_LINUX_IOCTL) -static boolean InitAudioDevice_Linux(); -#elif defined(PLATFORM_NETBSD) -static boolean InitAudioDevice_NetBSD(); -#elif defined(PLATFORM_HPUX) -static boolean InitAudioDevice_HPUX(); #elif defined(PLATFORM_MSDOS) static void SoundServer_InsertNewSound(struct SoundControl); -static void SoundServer_StopSound(int); +static void SoundServer_StopSound(struct SoundControl); static void SoundServer_StopAllSounds(); #endif @@ -209,7 +209,7 @@ void SoundServer(void) (int)sqrt((float)(PSND_MAX_LEFT2RIGHT * PSND_MAX_LEFT2RIGHT - i * i)); #if defined(PLATFORM_HPUX) - InitAudioDevice_HPUX(); + InitAudioDevice_HPUX(&afmt); #endif FD_ZERO(&sound_fdset); @@ -227,16 +227,65 @@ void SoundServer(void) if (snd_ctrl.reload_sounds || snd_ctrl.reload_music) { - for(i=0; ifullpath != NULL) + free(leveldir_current->fullpath); + if (ti->basepath != NULL) + free(ti->basepath); + if (ti->fullpath != NULL) + free(ti->fullpath); + + if (read(audio.soundserver_pipe[0], set_name, + snd_ctrl.data_len) != snd_ctrl.data_len || + read(audio.soundserver_pipe[0], leveldir_current, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.soundserver_pipe[0], ti, + sizeof(TreeInfo)) != sizeof(TreeInfo) || + read(audio.soundserver_pipe[0], &str_size1, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.soundserver_pipe[0], &str_size2, + sizeof(unsigned long)) != sizeof(unsigned long) || + read(audio.soundserver_pipe[0], &str_size3, + 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); + + if (read(audio.soundserver_pipe[0], leveldir_current->fullpath, + str_size1) != str_size1 || + read(audio.soundserver_pipe[0], ti->basepath, + str_size2) != str_size2 || + read(audio.soundserver_pipe[0], ti->fullpath, + str_size3) != str_size3) + Error(ERR_EXIT_SOUND_SERVER, "broken pipe -- no sounds"); + + InitPlaylist(); close(audio.device_fd); if (snd_ctrl.reload_sounds) - ReloadSounds(); + { + artwork.sounds_set_current = set_name; + audio.func_reload_sounds(); + } else - ReloadMusic(); + { + artwork.music_set_current = set_name; + audio.func_reload_music(); + } + + free(set_name); continue; } @@ -293,40 +342,37 @@ void SoundServer(void) if (playing_sounds || snd_ctrl.active) { - struct timeval delay = { 0, 0 }; - byte *sample_ptr; - long sample_size; - static long max_sample_size = 0; - static long fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; - int sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; - static boolean stereo = TRUE; - if (playing_sounds || (audio.device_fd = OpenAudioDevice(audio.device_name)) >= 0) { + struct timeval delay = { 0, 0 }; + if (!playing_sounds) /* we just opened the audio device */ - { -#if defined(AUDIO_LINUX_IOCTL) - stereo = InitAudioDevice_Linux(fragment_size, sample_rate); -#elif defined(PLATFORM_NETBSD) - stereo = InitAudioDevice_NetBSD(fragment_size, sample_rate); -#endif - max_sample_size = fragment_size / (stereo ? 2 : 1); - } + InitAudioDevice_DSP(&afmt); if (snd_ctrl.active) /* new sound has arrived */ SoundServer_InsertNewSound(snd_ctrl); - while(playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) + while (playing_sounds && + select(audio.soundserver_pipe[0] + 1, + &sound_fdset, NULL, NULL, &delay) < 1) { + void *sample_ptr; + int sample_size; + int max_sample_size; + int fragment_size = afmt.fragment_size; + int sample_bytes = (afmt.format & AUDIO_FORMAT_U8 ? 1 : 2); + boolean stereo = afmt.stereo; + FD_SET(audio.soundserver_pipe[0], &sound_fdset); + max_sample_size = fragment_size / ((stereo ? 2 : 1) * sample_bytes); + /* first clear the last premixing buffer */ - memset(premix_last_buffer, 0, fragment_size * sizeof(int)); + memset(premix_last_buffer, 0, + max_sample_size * (stereo ? 2 : 1) * sizeof(long)); - for(i=0;i> PSND_MAX_VOLUME_BITS; /* fill the last mixing buffer with stereo or mono sound */ if (stereo) { - int middle_pos = PSND_MAX_LEFT2RIGHT/2; - int left_volume = stereo_volume[middle_pos +playlist[i].stereo]; - int right_volume = stereo_volume[middle_pos -playlist[i].stereo]; + int middle_pos = PSND_MAX_LEFT2RIGHT / 2; + int left_volume = stereo_volume[middle_pos + playlist[i].stereo]; + int right_volume= stereo_volume[middle_pos - playlist[i].stereo]; for(j=0; j> PSND_MAX_LEFT2RIGHT_BITS; premix_right_buffer[j] = - (right_volume * (int)premix_first_buffer[j]) + (right_volume * premix_first_buffer[j]) >> PSND_MAX_LEFT2RIGHT_BITS; - premix_last_buffer[2*j+0] += premix_left_buffer[j]; - premix_last_buffer[2*j+1] += premix_right_buffer[j]; + + premix_last_buffer[2 * j + 0] += premix_left_buffer[j]; + premix_last_buffer[2 * j + 1] += premix_right_buffer[j]; } } else { - for(j=0;j255) - playing_buffer[i] = 255; - else - playing_buffer[i] = (premix_last_buffer[i]>>1)^0x80; + /* 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 */ @@ -442,9 +545,9 @@ void SoundServer(void) { playing_sounds = 1; - while(playing_sounds && - select(audio.soundserver_pipe[0] + 1, - &sound_fdset, NULL, NULL, &delay) < 1) + while (playing_sounds && + select(audio.soundserver_pipe[0] + 1, + &sound_fdset, NULL, NULL, &delay) < 1) { FD_SET(audio.soundserver_pipe[0], &sound_fdset); @@ -647,12 +750,13 @@ static void SoundServer_InsertNewSound(struct SoundControl snd_ctrl) snd_ctrl.data_ptr = snd_info->data_ptr; snd_ctrl.data_len = snd_info->data_len; + snd_ctrl.format = snd_info->format; playlist[i] = snd_ctrl; playing_sounds++; #if defined(PLATFORM_MSDOS) - playlist[i].voice = allocate_voice(playlist[i].data_ptr); + playlist[i].voice = allocate_voice((SAMPLE *)playlist[i].data_ptr); if (snd_ctrl.loop) voice_set_playmode(playlist[i].voice, PLAYMODE_LOOP); @@ -738,16 +842,31 @@ static void SoundServer_StopAllSounds() /* ------------------------------------------------------------------------- */ #if defined(AUDIO_LINUX_IOCTL) -static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate) +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; - unsigned long fragment_spec = 0; + 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 */ - for (fragment_spec=0; (1 << fragment_spec) < fragment_size; - fragment_spec++); + 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 @@ -763,36 +882,43 @@ static boolean InitAudioDevice_Linux(long fragment_size, int sample_rate) Error(ERR_EXIT_SOUND_SERVER, "cannot set fragment size of /dev/dsp -- no sounds"); - /* try if we can use stereo sound */ - if (ioctl(audio.device_fd, SNDCTL_DSP_STEREO, &stereo) < 0) + i = 0; + afmt->format = 0; + while (formats[i].format_result != -1) { -#ifdef DEBUG - static boolean reported = FALSE; - - if (!reported) + unsigned int audio_format = formats[i].format_ioctl; + if (ioctl(audio.device_fd, SNDCTL_DSP_SETFMT, &audio_format) == 0) { - Error(ERR_RETURN, "cannot get stereo sound on /dev/dsp"); - reported = TRUE; + afmt->format = formats[i].format_result; + break; } -#endif - stereo = FALSE; } - if (ioctl(audio.device_fd, SNDCTL_DSP_SPEED, &sample_rate) < 0) + 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) < 0) + 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"); - - return (boolean)stereo; + 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 boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate) +static void InitAudioDevice_NetBSD(struct AudioFormatInfo *afmt) { audio_info_t a_info; boolean stereo = TRUE; @@ -804,23 +930,25 @@ static boolean InitAudioDevice_NetBSD(long fragment_size, int sample_rate) 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; - stereo = FALSE; + + 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"); } - - return stereo; } #endif /* PLATFORM_NETBSD */ #if defined(PLATFORM_HPUX) -static boolean InitAudioDevice_HPUX() +static void InitAudioDevice_HPUX(struct AudioFormatInfo *afmt) { struct audio_describe ainfo; int audio_ctl; @@ -838,12 +966,27 @@ static boolean InitAudioDevice_HPUX() ioctl(audio_ctl, AUDIO_SET_CHANNELS, 1); ioctl(audio_ctl, AUDIO_SET_SAMPLE_RATE, 8000); - close(audio_ctl); + afmt->format = AUDIO_FORMAT_U8; + afmt->stereo = FALSE; + afmt->sample_rate = 8000; - return TRUE; /* to provide common interface for InitAudioDevice_...() */ + close(audio_ctl); } #endif /* PLATFORM_HPUX */ +#if defined(PLATFORM_UNIX) +static void InitAudioDevice_DSP(struct AudioFormatInfo *afmt) +{ +#if defined(AUDIO_LINUX_IOCTL) + InitAudioDevice_Linux(afmt); +#elif defined(PLATFORM_NETBSD) + InitAudioDevice_NetBSD(afmt); +#elif defined(PLATFORM_HPUX) + InitAudioDevice_HPUX(afmt); +#endif +} +#endif /* PLATFORM_UNIX */ + #if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP) /* these two are stolen from "sox"... :) */ @@ -956,16 +1099,6 @@ static int ulaw_to_linear(unsigned char ulawbyte) /* ========================================================================= */ /* THE STUFF BELOW IS ONLY USED BY THE MAIN PROCESS */ -void ReloadSounds() -{ - printf("reloading sounds ...\n"); -} - -void ReloadMusic() -{ - printf("reloading music ...\n"); -} - #define CHUNK_ID_LEN 4 /* IFF style chunk id length */ #define WAV_HEADER_SIZE 16 /* size of WAV file header */ @@ -976,6 +1109,7 @@ static SoundInfo *Load_WAV(char *filename) byte sound_header_buffer[WAV_HEADER_SIZE]; char chunk_name[CHUNK_ID_LEN + 1]; int chunk_size; + short *data_ptr; FILE *file; int i; #endif @@ -1076,8 +1210,24 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } - for (i=0; idata_len; i++) - ((byte *)snd_info->data_ptr)[i] = ((byte *)snd_info->data_ptr)[i] ^ 0x80; + if (0) + { + /* convert unsigned 8 bit sample data to signed 16 bit sample data */ + + data_ptr = checked_malloc(snd_info->data_len * sizeof(short)); + + for (i=0; idata_len; i++) + data_ptr[i] = ((short)(((byte *)snd_info->data_ptr)[i] ^ 0x80)) << 8; + + free(snd_info->data_ptr); + snd_info->data_ptr = data_ptr; + + snd_info->format = AUDIO_FORMAT_S16; + } + else + { + snd_info->format = AUDIO_FORMAT_U8; + } #endif /* PLATFORM_UNIX */ @@ -1165,9 +1315,9 @@ void LoadCustomMusic(void) char *filename = getPath2(music_directory, basename); MusicInfo *mus_info = NULL; - if (FileIsSound(filename)) + if (FileIsSound(basename)) mus_info = Load_WAV(filename); - else if (FileIsMusic(filename)) + else if (FileIsMusic(basename)) mus_info = Load_MOD(filename); free(filename); @@ -1194,6 +1344,8 @@ void PlayMusic(int nr) #if defined(TARGET_SDL) + nr = nr % num_music; + if (Music[nr]->type == MUS_TYPE_MOD) { Mix_PlayMusic(Music[nr]->data_ptr, -1); @@ -1259,6 +1411,7 @@ void PlaySoundExt(int nr, int volume, int stereo, boolean loop_type) snd_ctrl.active = TRUE; #if 0 + /* now only used internally in sound server child process */ snd_ctrl.data_ptr = Sound[nr].data_ptr; snd_ctrl.data_len = Sound[nr].data_len; #endif @@ -1372,8 +1525,8 @@ void StopSoundExt(int nr, int method) Mix_HaltMusic(); } -#else -#if !defined(PLATFORM_MSDOS) +#elif !defined(PLATFORM_MSDOS) + if (audio.soundserver_pid == 0) /* we are child process */ return; @@ -1386,59 +1539,74 @@ void StopSoundExt(int nr, int method) #else sound_handler(snd_ctrl); #endif -#endif } -void InitReloadSounds(char *set_name) +static void InitReloadSoundsOrMusic(char *set_name, int type) { +#if defined(PLATFORM_UNIX) && !defined(TARGET_SDL) struct SoundControl snd_ctrl = emptySoundControl; + TreeInfo *ti = + (type == SND_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; +#endif if (!audio.sound_available) return; - snd_ctrl.reload_sounds = TRUE; - -#if defined(TARGET_SDL) - ReloadSounds(); +#if defined(TARGET_SDL) || defined(TARGET_ALLEGRO) + if (type == SND_RELOAD_SOUNDS) + audio.func_reload_sounds(); + else + audio.func_reload_music(); #elif defined(PLATFORM_UNIX) if (audio.soundserver_pid == 0) /* we are child process */ return; - if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0) + if (leveldir_current == NULL) /* should never happen */ + Error(ERR_EXIT, "leveldir_current == NULL"); + + snd_ctrl.reload_sounds = (type == SND_RELOAD_SOUNDS); + snd_ctrl.reload_music = (type == SND_RELOAD_MUSIC); + snd_ctrl.data_len = strlen(set_name) + 1; + + if (write(audio.soundserver_pipe[1], &snd_ctrl, + sizeof(snd_ctrl)) < 0 || + write(audio.soundserver_pipe[1], set_name, + snd_ctrl.data_len) < 0 || + write(audio.soundserver_pipe[1], leveldir_current, + sizeof(TreeInfo)) < 0 || + write(audio.soundserver_pipe[1], ti, + sizeof(TreeInfo)) < 0 || + write(audio.soundserver_pipe[1], &str_size1, + sizeof(unsigned long)) < 0 || + write(audio.soundserver_pipe[1], &str_size2, + sizeof(unsigned long)) < 0 || + write(audio.soundserver_pipe[1], &str_size3, + sizeof(unsigned long)) < 0 || + write(audio.soundserver_pipe[1], leveldir_current->fullpath, + str_size1) < 0 || + write(audio.soundserver_pipe[1], ti->basepath, + str_size2) < 0 || + write(audio.soundserver_pipe[1], ti->fullpath, + str_size3) < 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 } -void InitReloadMusic(char *set_name) +void InitReloadSounds(char *set_name) { - struct SoundControl snd_ctrl = emptySoundControl; - - if (!audio.sound_available) - return; - - snd_ctrl.reload_music = TRUE; - -#if defined(TARGET_SDL) - ReloadMusic(); -#elif defined(PLATFORM_UNIX) - if (audio.soundserver_pid == 0) /* we are child process */ - return; + InitReloadSoundsOrMusic(set_name, SND_RELOAD_SOUNDS); +} - if (write(audio.soundserver_pipe[1], &snd_ctrl, sizeof(snd_ctrl)) < 0) - { - Error(ERR_WARN, "cannot pipe to child process -- no sounds"); - audio.sound_available = audio.sound_enabled = FALSE; - return; - } -#elif defined(PLATFORM_MSDOS) - sound_handler(snd_ctrl); -#endif +void InitReloadMusic(char *set_name) +{ + InitReloadSoundsOrMusic(set_name, SND_RELOAD_MUSIC); } void FreeSound(SoundInfo *sound) @@ -1493,6 +1661,9 @@ void FreeAllSounds() FreeSound(Sound[i]); free(Sound); + + Sound = NULL; + num_sounds = 0; } void FreeAllMusic() @@ -1506,6 +1677,9 @@ void FreeAllMusic() FreeMusic(Music[i]); free(Music); + + Music = NULL; + num_music = 0; } /* THE STUFF ABOVE IS ONLY USED BY THE MAIN PROCESS */