X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsound.c;h=30416a9066d055a24385b063cd459cac731cde24;hb=b3affbb697be5cd5cfe64b757fa018ec4441d76c;hp=144dd1ad5dccc26ee07e419f34b81fb7cd168ece;hpb=caed1f8c1a80db15b94da8a59bba3e95f7bd06db;p=rocksndiamonds.git diff --git a/src/libgame/sound.c b/src/libgame/sound.c index 144dd1ad..30416a90 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -40,31 +40,25 @@ 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 short premix_second_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 short 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 boolean InitAudioDevice_DSP(int, int); +#elif defined(PLATFORM_HPUX) +static boolean InitAudioDevice_HPUX(); #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(struct SoundControl); @@ -343,26 +337,16 @@ void SoundServer(void) if (playing_sounds || snd_ctrl.active) { - struct timeval delay = { 0, 0 }; - byte *sample_ptr; - long sample_size; - static int max_sample_size = 0; - static int 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 }; + static int fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; + int sample_rate = DEFAULT_AUDIO_SAMPLE_RATE; + static boolean stereo = TRUE; + 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) * sizeof(short)); - } + stereo = InitAudioDevice_DSP(fragment_size, sample_rate); if (snd_ctrl.active) /* new sound has arrived */ SoundServer_InsertNewSound(snd_ctrl); @@ -371,10 +355,17 @@ void SoundServer(void) select(audio.soundserver_pipe[0] + 1, &sound_fdset, NULL, NULL, &delay) < 1) { + short *sample_ptr; + int sample_size; + int max_sample_size; + FD_SET(audio.soundserver_pipe[0], &sound_fdset); + max_sample_size = fragment_size / ((stereo ? 2 : 1) * sizeof(short)); + /* first clear the last premixing buffer */ - memset(premix_last_buffer, 0, fragment_size * sizeof(short)); + memset(premix_last_buffer, 0, + max_sample_size * (stereo ? 2 : 1) * sizeof(long)); for(i=0; i= SOUND_FADING_VOLUME_THRESHOLD) @@ -413,8 +402,8 @@ void SoundServer(void) /* adjust volume of actual sound sample */ if (playlist[i].volume != PSND_MAX_VOLUME) for(j=0; j> PSND_MAX_VOLUME_BITS; /* fill the last mixing buffer with stereo or mono sound */ @@ -427,10 +416,10 @@ void SoundServer(void) for(j=0; j> PSND_MAX_LEFT2RIGHT_BITS; premix_right_buffer[j] = - (right_volume * premix_second_buffer[j]) + (right_volume * premix_first_buffer[j]) >> PSND_MAX_LEFT2RIGHT_BITS; premix_last_buffer[2 * j + 0] += premix_left_buffer[j]; @@ -440,7 +429,7 @@ void SoundServer(void) else { for(j=0; j 65535) - playing_buffer[i] = 32767; - else - playing_buffer[i] = (short)(premix_last_buffer[i] >> 1); + premix_last_buffer[i] = 65535; + + /* shift to 16 bit value */ + premix_last_buffer[i] >>= 1; + + /* fill playing buffer for "signed 16 bit little endian" audio + format (independently of endianess of "short" integer type) */ + playing_buffer[2 * i + 0] = premix_last_buffer[i] & 0xff; + playing_buffer[2 * i + 1] = premix_last_buffer[i] >> 8; } /* finally play the sound fragment */ @@ -908,6 +904,19 @@ static boolean InitAudioDevice_HPUX() } #endif /* PLATFORM_HPUX */ +#if defined(PLATFORM_UNIX) +static boolean InitAudioDevice_DSP(int fragment_size, int sample_rate) +{ +#if defined(AUDIO_LINUX_IOCTL) + return InitAudioDevice_Linux(fragment_size, sample_rate); +#elif defined(PLATFORM_NETBSD) + return InitAudioDevice_NetBSD(fragment_size, sample_rate); +#elif defined(PLATFORM_HPUX) + return InitAudioDevice_HPUX(); +#endif +} +#endif /* PLATFORM_UNIX */ + #if defined(PLATFORM_UNIX) && !defined(AUDIO_STREAMING_DSP) /* these two are stolen from "sox"... :) */ @@ -1030,6 +1039,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 @@ -1130,8 +1140,15 @@ static SoundInfo *Load_WAV(char *filename) return NULL; } + /* 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++) - ((byte *)snd_info->data_ptr)[i] ^= 0x80; + data_ptr[i] = ((short)(((byte *)snd_info->data_ptr)[i] ^ 0x80)) << 8; + + free(snd_info->data_ptr); + snd_info->data_ptr = data_ptr; #endif /* PLATFORM_UNIX */