From: eviltypeguy Date: Mon, 23 Sep 2002 02:02:33 +0000 (+0000) Subject: Make formatting sane X-Git-Tag: RELEASE_0_2_0_RC1~216 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75ed3f5912a36f85ba78cae4e98e54e19c098686;p=xonotic%2Fdarkplaces.git Make formatting sane git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2418 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/snd_oss.c b/snd_oss.c index 9d0856d8..14fe64ef 100644 --- a/snd_oss.c +++ b/snd_oss.c @@ -36,29 +36,27 @@ static int tryrates[] = { 11025, 22051, 44100, 8000 }; qboolean SNDDMA_Init(void) { - int rc; - int fmt; + int fmt; int tmp; - int i; - char *s; + int i; + char *s; struct audio_buf_info info; int caps; snd_inited = 0; -// open /dev/dsp, confirm capability to mmap, and get size of dma buffer - + // open /dev/dsp, confirm capability to mmap, and get size of dma buffer audio_fd = open("/dev/dsp", O_RDWR); - if (audio_fd < 0) + if (audio_fd < 0) { perror("/dev/dsp"); - Con_Printf("Could not open /dev/dsp\n"); + Con_Printf("Could not open /dev/dsp\n"); return 0; } - rc = ioctl(audio_fd, SNDCTL_DSP_RESET, 0); - if (rc < 0) + rc = ioctl(audio_fd, SNDCTL_DSP_RESET, 0); + if (rc < 0) { perror("/dev/dsp"); Con_Printf("Could not reset /dev/dsp\n"); @@ -69,7 +67,7 @@ qboolean SNDDMA_Init(void) if (ioctl(audio_fd, SNDCTL_DSP_GETCAPS, &caps)==-1) { perror("/dev/dsp"); - Con_Printf("Sound driver too old\n"); + Con_Printf("Sound driver too old\n"); close(audio_fd); return 0; } @@ -81,56 +79,64 @@ qboolean SNDDMA_Init(void) return 0; } - if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info)==-1) - { - perror("GETOSPACE"); + if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info)==-1) + { + perror("GETOSPACE"); Con_Printf("Um, can't do GETOSPACE?\n"); close(audio_fd); return 0; - } + } shm = &sn; - shm->splitbuffer = 0; + shm->splitbuffer = 0; -// set sample bits & speed - - s = getenv("QUAKE_SOUND_SAMPLEBITS"); - if (s) shm->samplebits = atoi(s); + // set sample bits & speed + s = getenv("QUAKE_SOUND_SAMPLEBITS"); + if (s) + shm->samplebits = atoi(s); else if ((i = COM_CheckParm("-sndbits")) != 0) shm->samplebits = atoi(com_argv[i+1]); + if (shm->samplebits != 16 && shm->samplebits != 8) - { - ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt); - if (fmt & AFMT_S16_LE) shm->samplebits = 16; - else if (fmt & AFMT_U8) shm->samplebits = 8; + { + ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt); + if (fmt & AFMT_S16_LE) + shm->samplebits = 16; + else if (fmt & AFMT_U8) + shm->samplebits = 8; } - s = getenv("QUAKE_SOUND_SPEED"); - if (s) shm->speed = atoi(s); + s = getenv("QUAKE_SOUND_SPEED"); + if (s) + shm->speed = atoi(s); else if ((i = COM_CheckParm("-sndspeed")) != 0) shm->speed = atoi(com_argv[i+1]); - else - { - for (i=0 ; ispeed = tryrates[i]; + else + { + for (i=0 ; ispeed = tryrates[i]; } - s = getenv("QUAKE_SOUND_CHANNELS"); - if (s) shm->channels = atoi(s); + s = getenv("QUAKE_SOUND_CHANNELS"); + if (s) + shm->channels = atoi(s); else if ((i = COM_CheckParm("-sndmono")) != 0) shm->channels = 1; else if ((i = COM_CheckParm("-sndstereo")) != 0) shm->channels = 2; - else shm->channels = 2; + else + shm->channels = 2; shm->samples = info.fragstotal * info.fragsize / (shm->samplebits/8); shm->submission_chunk = 1; -// memory map the dma buffer - + // memory map the dma buffer shm->buffer = (unsigned char *) mmap(NULL, info.fragstotal - * info.fragsize, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0); + * info.fragsize, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0); if (!shm->buffer || shm->buffer == (unsigned char *)-1) { perror("/dev/dsp"); @@ -142,52 +148,53 @@ qboolean SNDDMA_Init(void) tmp = 0; if (shm->channels == 2) tmp = 1; - rc = ioctl(audio_fd, SNDCTL_DSP_STEREO, &tmp); - if (rc < 0) - { + + rc = ioctl(audio_fd, SNDCTL_DSP_STEREO, &tmp); + if (rc < 0) + { perror("/dev/dsp"); - Con_Printf("Could not set /dev/dsp to stereo=%d", shm->channels); + Con_Printf("Could not set /dev/dsp to stereo=%d", shm->channels); close(audio_fd); - return 0; - } + return 0; + } if (tmp) shm->channels = 2; else shm->channels = 1; - rc = ioctl(audio_fd, SNDCTL_DSP_SPEED, &shm->speed); - if (rc < 0) - { + rc = ioctl(audio_fd, SNDCTL_DSP_SPEED, &shm->speed); + if (rc < 0) + { perror("/dev/dsp"); - Con_Printf("Could not set /dev/dsp speed to %d", shm->speed); + Con_Printf("Could not set /dev/dsp speed to %d", shm->speed); close(audio_fd); - return 0; - } + return 0; + } - if (shm->samplebits == 16) - { - rc = AFMT_S16_LE; - rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc); - if (rc < 0) + if (shm->samplebits == 16) + { + rc = AFMT_S16_LE; + rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc); + if (rc < 0) { perror("/dev/dsp"); Con_Printf("Could not support 16-bit data. Try 8-bit.\n"); close(audio_fd); return 0; } - } - else if (shm->samplebits == 8) - { - rc = AFMT_U8; - rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc); - if (rc < 0) + } + else if (shm->samplebits == 8) + { + rc = AFMT_U8; + rc = ioctl(audio_fd, SNDCTL_DSP_SETFMT, &rc); + if (rc < 0) { perror("/dev/dsp"); Con_Printf("Could not support 8-bit data.\n"); close(audio_fd); return 0; } - } + } else { perror("/dev/dsp"); @@ -196,10 +203,9 @@ qboolean SNDDMA_Init(void) return 0; } -// toggle the trigger & start her up - - tmp = 0; - rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp); + // toggle the trigger & start her up + tmp = 0; + rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp); if (rc < 0) { perror("/dev/dsp"); @@ -207,8 +213,8 @@ qboolean SNDDMA_Init(void) close(audio_fd); return 0; } - tmp = PCM_ENABLE_OUTPUT; - rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp); + tmp = PCM_ENABLE_OUTPUT; + rc = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp); if (rc < 0) { perror("/dev/dsp"); @@ -221,7 +227,6 @@ qboolean SNDDMA_Init(void) snd_inited = 1; return 1; - } int SNDDMA_GetDMAPos(void) @@ -242,7 +247,6 @@ int SNDDMA_GetDMAPos(void) shm->samplepos = count.ptr / (shm->samplebits / 8); return shm->samplepos; - } void SNDDMA_Shutdown(void)