X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=snd_oss.c;h=d06e4780b9d14ecdbbfe4b5438f413d116caec43;hb=9976ca010e51f14b9dfe4c5bc1f945344d3d9bf7;hp=61e8d0eb64898110ecbafec99d93aaa04a2cbd3c;hpb=f85c51b632f3e340d5a70418c47895ed11dc2cbd;p=xonotic%2Fdarkplaces.git diff --git a/snd_oss.c b/snd_oss.c index 61e8d0eb..d06e4780 100644 --- a/snd_oss.c +++ b/snd_oss.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -25,43 +25,46 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include +#include #include #include "quakedef.h" int audio_fd; int snd_inited; -static int tryrates[] = { 11025, 22051, 44100, 8000 }; +static int tryrates[] = {44100, 22050, 11025, 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; + int format16bit; +#if BYTE_ORDER == BIG_ENDIAN + format16bit = AFMT_S16_BE; +#else + format16bit = AFMT_S16_LE; +#endif 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_Print("Could not open /dev/dsp\n"); return 0; } - rc = ioctl(audio_fd, SNDCTL_DSP_RESET, 0); - if (rc < 0) + if (ioctl(audio_fd, SNDCTL_DSP_RESET, 0) < 0) { perror("/dev/dsp"); - Con_Printf("Could not reset /dev/dsp\n"); + Con_Print("Could not reset /dev/dsp\n"); close(audio_fd); return 0; } @@ -69,150 +72,153 @@ qboolean SNDDMA_Init(void) if (ioctl(audio_fd, SNDCTL_DSP_GETCAPS, &caps)==-1) { perror("/dev/dsp"); - Con_Printf("Sound driver too old\n"); + Con_Print("Sound driver too old\n"); close(audio_fd); return 0; } if (!(caps & DSP_CAP_TRIGGER) || !(caps & DSP_CAP_MMAP)) { - Con_Printf("Sorry but your soundcard can't do this\n"); + Con_Print("Sorry but your soundcard can't do this\n"); close(audio_fd); return 0; } - if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info)==-1) - { - perror("GETOSPACE"); - Con_Printf("Um, can't do GETOSPACE?\n"); + if (ioctl(audio_fd, SNDCTL_DSP_GETOSPACE, &info)==-1) + { + perror("GETOSPACE"); + Con_Print("Um, can't do GETOSPACE?\n"); close(audio_fd); return 0; - } - - shm = &sn; - 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->format.width = atoi(s) / 8; 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; + shm->format.width = atoi(com_argv[i+1]) / 8; + + if (shm->format.width != 2 && shm->format.width != 1) + { + ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt); + if (fmt & format16bit) + shm->format.width = 2; + else if (fmt & AFMT_U8) + shm->format.width = 1; } - s = getenv("QUAKE_SOUND_SPEED"); - if (s) shm->speed = atoi(s); + s = getenv("QUAKE_SOUND_SPEED"); + if (s) + shm->format.speed = atoi(s); else if ((i = COM_CheckParm("-sndspeed")) != 0) - shm->speed = atoi(com_argv[i+1]); - else - { - for (i=0 ; ispeed = tryrates[i]; + shm->format.speed = atoi(com_argv[i+1]); + else + { + for (i = 0;i < (int) sizeof(tryrates) / 4;i++) + if (!ioctl(audio_fd, SNDCTL_DSP_SPEED, &tryrates[i])) + break; + + shm->format.speed = tryrates[i]; } - s = getenv("QUAKE_SOUND_CHANNELS"); - if (s) shm->channels = atoi(s); + s = getenv("QUAKE_SOUND_CHANNELS"); + if (s) + shm->format.channels = atoi(s); else if ((i = COM_CheckParm("-sndmono")) != 0) - shm->channels = 1; + shm->format.channels = 1; else if ((i = COM_CheckParm("-sndstereo")) != 0) - shm->channels = 2; - else shm->channels = 2; - - shm->samples = info.fragstotal * info.fragsize / (shm->samplebits/8); - shm->submission_chunk = 1; + shm->format.channels = 2; + else + shm->format.channels = 2; -// memory map the dma buffer + shm->samples = info.fragstotal * info.fragsize / shm->format.width; - shm->buffer = (unsigned char *) mmap(NULL, info.fragstotal - * info.fragsize, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0); + // memory map the dma buffer + shm->bufferlength = info.fragstotal * info.fragsize; + shm->buffer = (unsigned char *) mmap(NULL, shm->bufferlength, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0); if (!shm->buffer || shm->buffer == (unsigned char *)-1) { perror("/dev/dsp"); - Con_Printf("Could not mmap /dev/dsp\n"); + Con_Print("Could not mmap /dev/dsp\n"); close(audio_fd); return 0; } tmp = 0; - if (shm->channels == 2) + if (shm->format.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\n", shm->format.channels); close(audio_fd); - return 0; - } + return 0; + } if (tmp) - shm->channels = 2; + shm->format.channels = 2; else - shm->channels = 1; + shm->format.channels = 1; - rc = ioctl(audio_fd, SNDCTL_DSP_SPEED, &shm->speed); - if (rc < 0) - { + rc = ioctl(audio_fd, SNDCTL_DSP_SPEED, &shm->format.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\n", shm->format.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->format.width == 2) + { + rc = format16bit; + 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"); + Con_Print("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->format.width == 1) + { + 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"); + Con_Print("Could not support 8-bit data.\n"); close(audio_fd); return 0; } - } + } else { perror("/dev/dsp"); - Con_Printf("%d-bit sound not supported.", shm->samplebits); + Con_Printf("%d-bit sound not supported.\n", shm->format.width * 8); close(audio_fd); 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"); - Con_Printf("Could not toggle.\n"); + Con_Print("Could not toggle.\n"); 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"); - Con_Printf("Could not toggle.\n"); + Con_Print("Could not toggle.\n"); close(audio_fd); return 0; } @@ -221,7 +227,6 @@ qboolean SNDDMA_Init(void) snd_inited = 1; return 1; - } int SNDDMA_GetDMAPos(void) @@ -234,22 +239,30 @@ int SNDDMA_GetDMAPos(void) if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &count)==-1) { perror("/dev/dsp"); - Con_Printf("Uh, sound dead.\n"); + Con_Print("Uh, sound dead.\n"); close(audio_fd); snd_inited = 0; return 0; } - shm->samplepos = count.ptr / (shm->samplebits / 8); + shm->samplepos = count.ptr / shm->format.width; return shm->samplepos; - } void SNDDMA_Shutdown(void) { + int tmp; if (snd_inited) { + // unmap the memory + munmap(shm->buffer, shm->bufferlength); + // stop the sound + tmp = 0; + ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp); + ioctl(audio_fd, SNDCTL_DSP_RESET, 0); + // close the device close(audio_fd); + audio_fd = -1; snd_inited = 0; } } @@ -273,3 +286,4 @@ void *S_LockBuffer(void) void S_UnlockBuffer(void) { } +