fix nail and explosion sound defaults

[xonotic/darkplaces.git] / snd_oss.c

diff --git a/snd_oss.c b/snd_oss.c
index bdb8afcf2275bcd7655a9098a7bb6c4718d8ac73..f50c321c58c03d2cd2aa7d6145091c72ce7575bc 100644 (file)
--- a/snd_oss.c
+++ b/snd_oss.c
@@ -17,6 +17,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
+
+// OSS module, used by Linux and FreeBSD
+
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
@@ -31,9 +34,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "snd_main.h"
 
 int audio_fd;
-int snd_inited;
 
-static int tryrates[] = {44100, 22050, 11025, 8000};
+static int tryrates[] = {44100, 48000, 22050, 24000, 11025, 16000, 8000};
 
 qboolean SNDDMA_Init(void)
 {
@@ -51,10 +53,9 @@ qboolean SNDDMA_Init(void)
 #else
        format16bit = AFMT_S16_LE;
 #endif
-       snd_inited = 0;
 
        // open /dev/dsp, confirm capability to mmap, and get size of dma buffer
-    audio_fd = open("/dev/dsp", O_RDWR);
+    audio_fd = open("/dev/dsp", O_RDWR);  // we have to open it O_RDWR for mmap
        if (audio_fd < 0)
        {
                perror("/dev/dsp");
@@ -118,7 +119,7 @@ qboolean SNDDMA_Init(void)
                shm->format.speed = atoi(com_argv[i+1]);
        else
        {
-               for (i = 0;i < (int) sizeof(tryrates) / 4;i++)
+               for (i = 0;i < (int) sizeof(tryrates) / (int) sizeof(tryrates[0]);i++)
                        if (!ioctl(audio_fd, SNDCTL_DSP_SPEED, &tryrates[i]))
                                break;
 
@@ -132,40 +133,18 @@ qboolean SNDDMA_Init(void)
        else if ((i = COM_CheckParm("-sndmono")) != 0)
                shm->format.channels = 1;
 // COMMANDLINEOPTION: Linux OSS Sound: -sndstereo sets sound output to stereo
-       else if ((i = COM_CheckParm("-sndstereo")) != 0)
+       else // if ((i = COM_CheckParm("-sndstereo")) != 0)
                shm->format.channels = 2;
-       else
-               shm->format.channels = 2;
-
-       shm->samples = info.fragstotal * info.fragsize / shm->format.width;
-
-       // 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_Print("Could not mmap /dev/dsp\n");
-               close(audio_fd);
-               return 0;
-       }
-
-       tmp = 0;
-       if (shm->format.channels == 2)
-               tmp = 1;
 
+       tmp = (shm->format.channels == 2);
        rc = ioctl(audio_fd, SNDCTL_DSP_STEREO, &tmp);
        if (rc < 0)
        {
                perror("/dev/dsp");
-               Con_Printf("Could not set /dev/dsp to stereo=%d\n", shm->format.channels);
+               Con_Printf("Could not set /dev/dsp to stereo=%d\n", tmp);
                close(audio_fd);
                return 0;
        }
-       if (tmp)
-               shm->format.channels = 2;
-       else
-               shm->format.channels = 1;
 
        rc = ioctl(audio_fd, SNDCTL_DSP_SPEED, &shm->format.speed);
        if (rc < 0)
@@ -208,6 +187,20 @@ qboolean SNDDMA_Init(void)
                return 0;
        }
 
+       shm->sampleframes = info.fragstotal * info.fragsize / shm->format.width / shm->format.channels;
+       shm->samples = shm->sampleframes * shm->format.channels;
+
+       // memory map the dma buffer
+       shm->bufferlength = info.fragstotal * info.fragsize;
+       shm->buffer = (unsigned char *) mmap(NULL, shm->bufferlength, PROT_WRITE, MAP_FILE|MAP_SHARED, audio_fd, 0);
+       if (!shm->buffer || shm->buffer == (unsigned char *)-1)
+       {
+               perror("/dev/dsp");
+               Con_Print("Could not mmap /dev/dsp\n");
+               close(audio_fd);
+               return 0;
+       }
+
        // toggle the trigger & start her up
        tmp = 0;
        rc  = ioctl(audio_fd, SNDCTL_DSP_SETTRIGGER, &tmp);
@@ -230,7 +223,6 @@ qboolean SNDDMA_Init(void)
 
        shm->samplepos = 0;
 
-       snd_inited = 1;
        return 1;
 }
 
@@ -239,14 +231,13 @@ int SNDDMA_GetDMAPos(void)
 
        struct count_info count;
 
-       if (!snd_inited) return 0;
+       if (!shm) return 0;
 
        if (ioctl(audio_fd, SNDCTL_DSP_GETOPTR, &count)==-1)
        {
                perror("/dev/dsp");
                Con_Print("Uh, sound dead.\n");
-               close(audio_fd);
-               snd_inited = 0;
+               S_Shutdown();
                return 0;
        }
        shm->samplepos = count.ptr / shm->format.width;
@@ -257,19 +248,15 @@ 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;
-       }
+       // 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;
 }
 
 /*