got rid of Cshader system as it really wasn't helping anything, now all surfaces...

[xonotic/darkplaces.git] / snd_oss.c

diff --git a/snd_oss.c b/snd_oss.c
index 14fe64efbdfba7a39e2e1e33283724b0e0627c97..e5fddc2fe2a8978d78dce8ddcb7828b36235d2ba 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, 22051, 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,28 +72,25 @@ 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");
@@ -100,7 +102,7 @@ qboolean SNDDMA_Init(void)
        if (shm->samplebits != 16 && shm->samplebits != 8)
        {
                ioctl(audio_fd, SNDCTL_DSP_GETFMTS, &fmt);
-               if (fmt & AFMT_S16_LE)
+               if (fmt & format16bit)
                        shm->samplebits = 16;
                else if (fmt & AFMT_U8)
                        shm->samplebits = 8;
@@ -113,10 +115,9 @@ qboolean SNDDMA_Init(void)
                shm->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];
     }
@@ -132,15 +133,14 @@ qboolean SNDDMA_Init(void)
                shm->channels = 2;
 
        shm->samples = info.fragstotal * info.fragsize / (shm->samplebits/8);
-       shm->submission_chunk = 1;
 
        // 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;
        }
@@ -153,7 +153,7 @@ qboolean SNDDMA_Init(void)
        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->channels);
                close(audio_fd);
                return 0;
        }
@@ -166,19 +166,19 @@ qboolean SNDDMA_Init(void)
        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->speed);
                close(audio_fd);
                return 0;
        }
 
        if (shm->samplebits == 16)
        {
-               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;
                }
@@ -190,7 +190,7 @@ qboolean SNDDMA_Init(void)
                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 +198,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->samplebits);
                close(audio_fd);
                return 0;
        }
@@ -209,7 +209,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 +218,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,7 +239,7 @@ 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;
@@ -251,9 +251,18 @@ int SNDDMA_GetDMAPos(void)
 
 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;
        }
 }
@@ -277,3 +286,4 @@ void *S_LockBuffer(void)
 void S_UnlockBuffer(void)
 {
 }
+