]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - snd_oss.c
now compiles on x86_64 successfully (still a crash regarding progs strings to fix...
[xonotic/darkplaces.git] / snd_oss.c
index c939d7441904c588197b08c8365001bcd025ffc7..c2ae5101a739cd310e9c7954156c6bed99ecb1e2 100644 (file)
--- a/snd_oss.c
+++ b/snd_oss.c
@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 int audio_fd;
 int snd_inited;
 
-static int tryrates[] = { 11025, 22051, 44100, 8000 };
+static int tryrates[] = {44100, 22050, 11025, 8000};
 
 qboolean SNDDMA_Init(void)
 {
@@ -43,7 +43,13 @@ qboolean SNDDMA_Init(void)
        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
@@ -51,15 +57,14 @@ qboolean SNDDMA_Init(void)
        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;
        }
@@ -67,130 +72,129 @@ 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");
+               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);
+               shm->format.width = atoi(s) / 8;
+// COMMANDLINEOPTION: Linux OSS Sound: -sndbits <bits> chooses 8 bit or 16 bit sound output
        else if ((i = COM_CheckParm("-sndbits")) != 0)
-               shm->samplebits = atoi(com_argv[i+1]);
+               shm->format.width = atoi(com_argv[i+1]) / 8;
 
-       if (shm->samplebits != 16 && shm->samplebits != 8)
+       if (shm->format.width != 2 && shm->format.width != 1)
        {
                ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt);
-               if (fmt & AFMT_S16_LE)
-                       shm->samplebits = 16;
+               if (fmt & format16bit)
+                       shm->format.width = 2;
                else if (fmt & AFMT_U8)
-                       shm->samplebits = 8;
+                       shm->format.width = 1;
     }
 
        s = getenv("QUAKE_SOUND_SPEED");
        if (s)
-               shm->speed = atoi(s);
+               shm->format.speed = atoi(s);
+// COMMANDLINEOPTION: Linux OSS Sound: -sndspeed <hz> chooses 44100 hz, 22100 hz, or 11025 hz sound output rate
        else if ((i = COM_CheckParm("-sndspeed")) != 0)
-               shm->speed = atoi(com_argv[i+1]);
+               shm->format.speed = atoi(com_argv[i+1]);
        else
        {
-               for (i=0 ; i<sizeof(tryrates)/4 ; i++) {
+               for (i = 0;i < (int) sizeof(tryrates) / 4;i++)
                        if (!ioctl(audio_fd, SNDCTL_DSP_SPEED, &tryrates[i]))
                                break;
-               }
 
-               shm->speed = tryrates[i];
+               shm->format.speed = tryrates[i];
     }
 
        s = getenv("QUAKE_SOUND_CHANNELS");
        if (s)
-               shm->channels = atoi(s);
+               shm->format.channels = atoi(s);
+// COMMANDLINEOPTION: Linux OSS Sound: -sndmono sets sound output to mono
        else if ((i = COM_CheckParm("-sndmono")) != 0)
-               shm->channels = 1;
+               shm->format.channels = 1;
+// COMMANDLINEOPTION: Linux OSS Sound: -sndstereo sets sound output to stereo
        else if ((i = COM_CheckParm("-sndstereo")) != 0)
-               shm->channels = 2;
+               shm->format.channels = 2;
        else
-               shm->channels = 2;
+               shm->format.channels = 2;
 
-       shm->samples = info.fragstotal * info.fragsize / (shm->samplebits/8);
-       shm->submission_chunk = 1;
+       shm->samples = info.fragstotal * info.fragsize / shm->format.width;
 
        // memory map the dma buffer
-       shm->buffer = (unsigned char *) mmap(NULL, info.fragstotal
-               * info.fragsize, PROT_READ|PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
+       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)
        {
                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;
        }
        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);
+       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;
        }
 
-       if (shm->samplebits == 16)
+       if (shm->format.width == 2)
        {
-               rc = AFMT_S16_LE;
+               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)
+       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;
                }
@@ -198,7 +202,7 @@ qboolean SNDDMA_Init(void)
        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;
        }
@@ -209,7 +213,7 @@ qboolean SNDDMA_Init(void)
        if (rc < 0)
        {
                perror("/dev/dsp");
-               Con_Printf("Could not toggle.\n");
+               Con_Print("Could not toggle.\n");
                close(audio_fd);
                return 0;
        }
@@ -218,7 +222,7 @@ qboolean SNDDMA_Init(void)
        if (rc < 0)
        {
                perror("/dev/dsp");
-               Con_Printf("Could not toggle.\n");
+               Con_Print("Could not toggle.\n");
                close(audio_fd);
                return 0;
        }
@@ -239,21 +243,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;
        }
 }
@@ -278,11 +291,3 @@ void S_UnlockBuffer(void)
 {
 }
 
-
-void S_Open(void)
-{
-}
-
-void S_Close(void)
-{
-}