]> git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
Updated ALSA driver (API version 1.0). The vast majority of the code comes from Quake...
authormolivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 29 Apr 2004 07:51:11 +0000 (07:51 +0000)
committermolivier <molivier@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 29 Apr 2004 07:51:11 +0000 (07:51 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4117 d7cf8633-e32d-0410-b094-e92efae38249

makefile.inc
snd_alsa.c [new file with mode: 0644]
snd_alsa_0_5.c [deleted file]
snd_alsa_0_9.c [deleted file]

index 3a09a9b06b966766901365c2ef71842f711a3180..bd483b6a2607f9545014e61d34aca7c8b779decc 100644 (file)
@@ -144,15 +144,12 @@ CMD_UNIXRM=rm -rf
 
 ##### Linux specific variables #####
 
-# Recommended for: anyone not using ALSA 0.5
-OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_oss.o
-LIB_LINUXSOUND=
-# Recommended for: anyone using ALSA 0.5
-#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa_0_5.o
-#LIB_LINUXSOUND=-lasound
-# Recommended for: no one (this driver needs to be updated, it doesn't compile anymore)
-#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa_0_9.o
-#LIB_LINUXSOUND=-lasound
+# Recommended for: anyone not using ALSA
+#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_oss.o
+#LIB_LINUXSOUND=
+# Recommended for: anyone using ALSA
+OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa.o
+LIB_LINUXSOUND=-lasound
 # Recommended for: anyone who can't use the above drivers
 #OBJ_LINUXSOUND=$(OBJ_NOSOUND)
 #LIB_LINUXSOUND=
diff --git a/snd_alsa.c b/snd_alsa.c
new file mode 100644 (file)
index 0000000..98f8c79
--- /dev/null
@@ -0,0 +1,341 @@
+/*
+       snd_alsa.c
+
+       Support for the ALSA 1.0.1 sound driver
+
+       Copyright (C) 1999,2000  contributors of the QuakeForge project
+       Please see the file "AUTHORS" for a list of contributors
+
+       This program is free software; you can redistribute it and/or
+       modify it under the terms of the GNU General Public License
+       as published by the Free Software Foundation; either version 2
+       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.
+
+       See the GNU General Public License for more details.
+
+       You should have received a copy of the GNU General Public License
+       along with this program; if not, write to:
+
+               Free Software Foundation, Inc.
+               59 Temple Place - Suite 330
+               Boston, MA  02111-1307, USA
+
+*/
+
+#include <alsa/asoundlib.h>
+
+#include "quakedef.h"
+
+static int                     snd_inited;
+static int                     snd_blocked = 0;
+static snd_pcm_uframes_t buffer_size;
+
+static const char  *pcmname = NULL;
+static snd_pcm_t   *pcm;
+
+qboolean SNDDMA_Init (void)
+{
+       int                                      err, i;
+       int                                      bps = -1, stereo = -1;
+       unsigned int             rate = 0;
+       snd_pcm_hw_params_t     *hw;
+       snd_pcm_sw_params_t     *sw;
+       snd_pcm_uframes_t        frag_size;
+
+       snd_pcm_hw_params_alloca (&hw);
+       snd_pcm_sw_params_alloca (&sw);
+
+       if ((i=COM_CheckParm("-sndpcm"))!=0)
+               pcmname=com_argv[i+1];
+       if (!pcmname)
+               pcmname = "default";
+
+       if ((i=COM_CheckParm("-sndbits")) != 0)
+       {
+               bps = atoi(com_argv[i+1]);
+               if (bps != 16 && bps != 8)
+               {
+                       Con_Printf("Error: invalid sample bits: %d\n", bps);
+                       return false;
+               }
+       }
+
+       if ((i=COM_CheckParm("-sndspeed")) != 0)
+       {
+               rate = atoi(com_argv[i+1]);
+               if (rate!=44100 && rate!=22050 && rate!=11025)
+               {
+                       Con_Printf("Error: invalid sample rate: %d\n", rate);
+                       return false;
+               }
+       }
+
+       if ((i=COM_CheckParm("-sndmono")) != 0)
+               stereo=0;
+       if ((i=COM_CheckParm("-sndstereo")) != 0)
+               stereo=1;
+
+       err = snd_pcm_open (&pcm, pcmname, SND_PCM_STREAM_PLAYBACK,
+                                                 SND_PCM_NONBLOCK);
+       if (0 > err) {
+               Sys_Printf ("Error: audio open error: %s\n", snd_strerror (err));
+               return 0;
+       }
+       Sys_Printf ("ALSA: Using PCM %s.\n", pcmname);
+
+       err = snd_pcm_hw_params_any (pcm, hw);
+       if (0 > err) {
+               Sys_Printf ("ALSA: error setting hw_params_any. %s\n",
+                                       snd_strerror (err));
+               goto error;
+       }
+
+       err = snd_pcm_hw_params_set_access (pcm, hw,
+                                                                                 SND_PCM_ACCESS_MMAP_INTERLEAVED);
+       if (0 > err) {
+               Sys_Printf ("ALSA: Failure to set noninterleaved PCM access. %s\n"
+                                       "Note: Interleaved is not supported\n",
+                                       snd_strerror (err));
+               goto error;
+       }
+
+       switch (bps) {
+               case -1:
+                       err = snd_pcm_hw_params_set_format (pcm, hw,
+                                                                                                 SND_PCM_FORMAT_S16);
+                       if (0 <= err) {
+                               bps = 16;
+                       } else if (0 <= (err = snd_pcm_hw_params_set_format (pcm, hw,
+                                                                                                                SND_PCM_FORMAT_U8))) {
+                               bps = 8;
+                       } else {
+                               Sys_Printf ("ALSA: no useable formats. %s\n",
+                                                       snd_strerror (err));
+                               goto error;
+                       }
+                       break;
+               case 8:
+               case 16:
+                       err = snd_pcm_hw_params_set_format (pcm, hw, bps == 8 ?
+                                                                                                 SND_PCM_FORMAT_U8 :
+                                                                                                 SND_PCM_FORMAT_S16);
+                       if (0 > err) {
+                               Sys_Printf ("ALSA: no usable formats. %s\n",
+                                                       snd_strerror (err));
+                               goto error;
+                       }
+                       break;
+               default:
+                       Sys_Printf ("ALSA: desired format not supported\n");
+                       goto error;
+       }
+
+       switch (stereo) {
+               case -1:
+                       err = snd_pcm_hw_params_set_channels (pcm, hw, 2);
+                       if (0 <= err) {
+                               stereo = 1;
+                       } else if (0 <= (err = snd_pcm_hw_params_set_channels (pcm, hw,
+                                                                                                                                        1))) {
+                               stereo = 0;
+                       } else {
+                               Sys_Printf ("ALSA: no usable channels. %s\n",
+                                                       snd_strerror (err));
+                               goto error;
+                       }
+                       break;
+               case 0:
+               case 1:
+                       err = snd_pcm_hw_params_set_channels (pcm, hw, stereo ? 2 : 1);
+                       if (0 > err) {
+                               Sys_Printf ("ALSA: no usable channels. %s\n",
+                                                       snd_strerror (err));
+                               goto error;
+                       }
+                       break;
+               default:
+                       Sys_Printf ("ALSA: desired channels not supported\n");
+                       goto error;
+       }
+
+       switch (rate) {
+               case 0:
+                       rate = 44100;
+                       err = snd_pcm_hw_params_set_rate_near (pcm, hw, &rate, 0);
+                       if (0 <= err) {
+                               frag_size = 32 * bps;
+                       } else {
+                               rate = 22050;
+                               err = snd_pcm_hw_params_set_rate_near (pcm, hw, &rate, 0);
+                               if (0 <= err) {
+                                       frag_size = 16 * bps;
+                               } else {
+                                       rate = 11025;
+                                       err = snd_pcm_hw_params_set_rate_near (pcm, hw, &rate,
+                                                                                                                        0);
+                                       if (0 <= err) {
+                                               frag_size = 8 * bps;
+                                       } else {
+                                               Sys_Printf ("ALSA: no usable rates. %s\n",
+                                                                       snd_strerror (err));
+                                               goto error;
+                                       }
+                               }
+                       }
+                       break;
+               case 11025:
+               case 22050:
+               case 44100:
+                       err = snd_pcm_hw_params_set_rate_near (pcm, hw, &rate, 0);
+                       if (0 > err) {
+                               Sys_Printf ("ALSA: desired rate %i not supported. %s\n", rate,
+                                                       snd_strerror (err));
+                               goto error;
+                       }
+                       frag_size = 8 * bps * rate / 11025;
+                       break;
+               default:
+                       Sys_Printf ("ALSA: desired rate %i not supported.\n", rate);
+                       goto error;
+       }
+
+       err = snd_pcm_hw_params_set_period_size_near (pcm, hw, &frag_size, 0);
+       if (0 > err) {
+               Sys_Printf ("ALSA: unable to set period size near %i. %s\n",
+                                       (int) frag_size, snd_strerror (err));
+               goto error;
+       }
+       err = snd_pcm_hw_params (pcm, hw);
+       if (0 > err) {
+               Sys_Printf ("ALSA: unable to install hw params: %s\n",
+                                       snd_strerror (err));
+               goto error;
+       }
+       err = snd_pcm_sw_params_current (pcm, sw);
+       if (0 > err) {
+               Sys_Printf ("ALSA: unable to determine current sw params. %s\n",
+                                       snd_strerror (err));
+               goto error;
+       }
+       err = snd_pcm_sw_params_set_start_threshold (pcm, sw, ~0U);
+       if (0 > err) {
+               Sys_Printf ("ALSA: unable to set playback threshold. %s\n",
+                                       snd_strerror (err));
+               goto error;
+       }
+       err = snd_pcm_sw_params_set_stop_threshold (pcm, sw, ~0U);
+       if (0 > err) {
+               Sys_Printf ("ALSA: unable to set playback stop threshold. %s\n",
+                                       snd_strerror (err));
+               goto error;
+       }
+       err = snd_pcm_sw_params (pcm, sw);
+       if (0 > err) {
+               Sys_Printf ("ALSA: unable to install sw params. %s\n",
+                                       snd_strerror (err));
+               goto error;
+       }
+
+       shm->format.channels = stereo + 1;
+       shm->samplepos = 0;
+       shm->format.width = bps / 8;
+
+       err = snd_pcm_hw_params_get_buffer_size (hw, &buffer_size);
+       if (0 > err) {
+               Sys_Printf ("ALSA: unable to get buffer size. %s\n",
+                                       snd_strerror (err));
+               goto error;
+       }
+
+       shm->samples = buffer_size * shm->format.channels;              // mono samples in buffer
+       shm->format.speed = rate;
+       SNDDMA_GetDMAPos ();            // sets shm->buffer
+       Sys_Printf ("%5d stereo\n", shm->format.channels - 1);
+       Sys_Printf ("%5d samples\n", shm->samples);
+       Sys_Printf ("%5d samplepos\n", shm->samplepos);
+       Sys_Printf ("%5d samplebits\n", shm->format.width * 8);
+       Sys_Printf ("%5d speed\n", shm->format.speed);
+       Sys_Printf ("0x%x dma buffer\n", (int) shm->buffer);
+
+       snd_inited = 1;
+       return true;
+
+error:
+       snd_pcm_close (pcm);
+       return false;
+}
+
+int SNDDMA_GetDMAPos (void)
+{
+       const snd_pcm_channel_area_t *areas;
+       snd_pcm_uframes_t offset;
+       snd_pcm_uframes_t nframes = shm->samples/shm->format.channels;
+
+       if (!snd_inited)
+               return 0;
+
+       snd_pcm_avail_update (pcm);
+       snd_pcm_mmap_begin (pcm, &areas, &offset, &nframes);
+       offset *= shm->format.channels;
+       nframes *= shm->format.channels;
+       shm->samplepos = offset;
+       shm->buffer = areas->addr;
+       return shm->samplepos;
+}
+
+void SNDDMA_Shutdown (void)
+{
+       if (snd_inited) {
+               snd_pcm_close (pcm);
+               snd_inited = 0;
+       }
+}
+
+/*
+       SNDDMA_Submit
+
+       Send sound to device if buffer isn't really the dma buffer
+*/
+void SNDDMA_Submit (void)
+{
+       int                     state;
+       int                     count = paintedtime - soundtime;
+       const snd_pcm_channel_area_t *areas;
+       snd_pcm_uframes_t nframes;
+       snd_pcm_uframes_t offset;
+
+       if (snd_blocked)
+               return;
+
+       nframes = count / shm->format.channels;
+
+       snd_pcm_avail_update (pcm);
+       snd_pcm_mmap_begin (pcm, &areas, &offset, &nframes);
+
+       state = snd_pcm_state (pcm);
+
+       switch (state) {
+               case SND_PCM_STATE_PREPARED:
+                       snd_pcm_mmap_commit (pcm, offset, nframes);
+                       snd_pcm_start (pcm);
+                       break;
+               case SND_PCM_STATE_RUNNING:
+                       snd_pcm_mmap_commit (pcm, offset, nframes);
+                       break;
+               default:
+                       break;
+       }
+}
+
+void *S_LockBuffer(void)
+{
+       return shm->buffer;
+}
+
+void S_UnlockBuffer(void)
+{
+}
diff --git a/snd_alsa_0_5.c b/snd_alsa_0_5.c
deleted file mode 100644 (file)
index a028986..0000000
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
-       snd_alsa_0_5.c
-
-       Support for ALSA 0.5, the old stable version of ALSA.
-
-       Copyright (C) 1999,2000  contributors of the QuakeForge project
-       Please see the file "AUTHORS" for a list of contributors
-
-       This program is free software; you can redistribute it and/or
-       modify it under the terms of the GNU General Public License
-       as published by the Free Software Foundation; either version 2
-       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.
-
-       See the GNU General Public License for more details.
-
-       You should have received a copy of the GNU General Public License
-       along with this program; if not, write to:
-
-               Free Software Foundation, Inc.
-               59 Temple Place - Suite 330
-               Boston, MA  02111-1307, USA
-
-       $Id$
-*/
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include "quakedef.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-#include <sys/types.h>
-#ifdef HAVE_SYS_IOCTL_H
-# include <sys/ioctl.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-# include <sys/mman.h>
-#endif
-#if defined HAVE_SYS_SOUNDCARD_H
-# include <sys/soundcard.h>
-#elif defined HAVE_LINUX_SOUNDCARD_H
-# include <linux/soundcard.h>
-#elif HAVE_MACHINE_SOUNDCARD_H
-# include <machine/soundcard.h>
-#endif
-
-#include <sys/asoundlib.h>
-
-#ifndef MAP_FAILED
-# define MAP_FAILED ((void*)-1)
-#endif
-
-extern int soundtime;
-static int snd_inited;
-
-static snd_pcm_t *pcm_handle;
-static struct snd_pcm_channel_info cinfo;
-static struct snd_pcm_channel_params params;
-static struct snd_pcm_channel_setup setup;
-static snd_pcm_mmap_control_t *mmap_control = NULL;
-static char *mmap_data = NULL;
-static int card=-1,dev=-1;
-
-int check_card(int card)
-{
-       snd_ctl_t *handle;
-       snd_ctl_hw_info_t info;
-       int rc;
-
-       if ((rc = snd_ctl_open(&handle, card)) < 0) {
-               Con_Printf("Error: control open (%i): %s\n", card, snd_strerror(rc));
-               return rc;
-       }
-       if ((rc = snd_ctl_hw_info(handle, &info)) < 0) {
-               Con_Printf("Error: control hardware info (%i): %s\n", card,
-                                  snd_strerror(rc));
-               snd_ctl_close(handle);
-               return rc;
-       }
-       snd_ctl_close(handle);
-       if (dev==-1) {
-               for (dev = 0; dev < info.pcmdevs; dev++) {
-                       if ((rc=snd_pcm_open(&pcm_handle,card,dev,
-                                                                SND_PCM_OPEN_PLAYBACK
-                                                                | SND_PCM_OPEN_NONBLOCK))==0) {
-                               return 0;
-                       }
-               }
-       } else {
-               if (dev>=0 && dev <info.pcmdevs) {
-                       if ((rc=snd_pcm_open(&pcm_handle,card,dev,
-                                                                SND_PCM_OPEN_PLAYBACK
-                                                                | SND_PCM_OPEN_NONBLOCK))==0) {
-                               return 0;
-                       }
-               }
-       }
-       return 1;
-}
-
-qboolean SNDDMA_Init(void)
-{
-       int rc=0,i;
-       char *err_msg="";
-       int rate=-1,format=-1,bps,stereo=-1,frag_size;
-       unsigned int mask;
-
-       mask = snd_cards_mask();
-       if (!mask) {
-               Con_Print("No sound cards detected\n");
-               return 0;
-       }
-       if ((i=COM_CheckParm("-sndcard"))!=0) {
-               card=atoi(com_argv[i+1]);
-       }
-       if ((i=COM_CheckParm("-snddev"))!=0) {
-               dev=atoi(com_argv[i+1]);
-       }
-       if ((i=COM_CheckParm("-sndbits")) != 0) {
-               i = atoi(com_argv[i+1]);
-               if (i==16) {
-                       format = SND_PCM_SFMT_S16_LE;
-               } else if (i==8) {
-                       format = SND_PCM_SFMT_U8;
-               } else {
-                       Con_Printf("Error: invalid sample bits: %d\n", i);
-                       return 0;
-               }
-       }
-       if ((i=COM_CheckParm("-sndspeed")) != 0) {
-               rate = atoi(com_argv[i+1]);
-               if (rate!=44100 && rate!=22050 && rate!=11025) {
-                       Con_Printf("Error: invalid sample rate: %d\n", rate);
-                       return 0;
-               }
-       }
-       if ((i=COM_CheckParm("-sndmono")) != 0) {
-               stereo=0;
-       }
-       if (card==-1) {
-               for (card=0; card<SND_CARDS; card++) {
-                       if (!(mask & (1<<card)))
-                               continue;
-                       rc=check_card(card);
-                       if (rc<0)
-                               return 0;
-                       if (!rc)
-                               goto dev_openned;
-               }
-       } else {
-               if (dev==-1) {
-                       rc=check_card(card);
-                       if (rc<0)
-                               return 0;
-                       if (!rc)
-                               goto dev_openned;
-               } else {
-                       if ((rc=snd_pcm_open(&pcm_handle,card,dev,
-                                                                SND_PCM_OPEN_PLAYBACK
-                                                                | SND_PCM_OPEN_NONBLOCK))<0) {
-                               Con_Printf("Error: audio open error: %s\n", snd_strerror(rc));
-                               return 0;
-                       }
-                       goto dev_openned;
-               }
-       }
-       Con_Printf("Error: audio open error: %s\n", snd_strerror(rc));
-       return 0;
-
- dev_openned:
-       Con_Printf("Using card %d, device %d.\n", card, dev);
-       memset(&cinfo, 0, sizeof(cinfo));
-       cinfo.channel = SND_PCM_CHANNEL_PLAYBACK;
-       snd_pcm_channel_info(pcm_handle, &cinfo);
-       Con_Printf("%08x %08x %08x\n",cinfo.flags,cinfo.formats,cinfo.rates);
-       if ((rate==-1 || rate==44100) && cinfo.rates & SND_PCM_RATE_44100) {
-               rate=44100;
-               frag_size=512;  /* assuming stereo 8 bit */
-       } else if ((rate==-1 || rate==22050) && cinfo.rates & SND_PCM_RATE_22050) {
-               rate=22050;
-               frag_size=256;  /* assuming stereo 8 bit */
-       } else if ((rate==-1 || rate==11025) && cinfo.rates & SND_PCM_RATE_11025) {
-               rate=11025;
-               frag_size=128;  /* assuming stereo 8 bit */
-       } else {
-               Con_Print("ALSA: desired rates not supported\n");
-               goto error_2;
-       }
-       if ((format==-1 || format==SND_PCM_SFMT_S16_LE) && cinfo.formats & SND_PCM_FMT_S16_LE) {
-               format=SND_PCM_SFMT_S16_LE;
-               bps=16;
-               frag_size*=2;
-       } else if ((format==-1 || format==SND_PCM_SFMT_U8) && cinfo.formats & SND_PCM_FMT_U8) {
-               format=SND_PCM_SFMT_U8;
-               bps=8;
-       } else {
-               Con_Print("ALSA: desired formats not supported\n");
-               goto error_2;
-       }
-       if (stereo && cinfo.max_voices>=2) {
-               stereo=1;
-       } else {
-               stereo=0;
-               frag_size/=2;
-       }
-
-       err_msg="audio munmap";
-       if ((rc=snd_pcm_munmap(pcm_handle, SND_PCM_CHANNEL_PLAYBACK))<0)
-               goto error;
-
-       memset(&params, 0, sizeof(params));
-       params.channel = SND_PCM_CHANNEL_PLAYBACK;
-       params.mode = SND_PCM_MODE_BLOCK;
-       params.format.interleave=1;
-       params.format.format=format;
-       params.format.rate=rate;
-       params.format.voices=stereo+1;
-       params.start_mode = SND_PCM_START_GO;
-       params.stop_mode = SND_PCM_STOP_ROLLOVER;
-       params.buf.block.frag_size=frag_size;
-       params.buf.block.frags_min=1;
-       params.buf.block.frags_max=-1;
-       err_msg="audio params";
-       if ((rc=snd_pcm_channel_params(pcm_handle, &params))<0)
-               goto error;
-
-       err_msg="audio mmap";
-       if ((rc=snd_pcm_mmap(pcm_handle, SND_PCM_CHANNEL_PLAYBACK, &mmap_control, (void **)&mmap_data))<0)
-               goto error;
-       err_msg="audio prepare";
-       if ((rc=snd_pcm_plugin_prepare(pcm_handle, SND_PCM_CHANNEL_PLAYBACK))<0)
-               goto error;
-
-       memset(&setup, 0, sizeof(setup));
-       setup.mode = SND_PCM_MODE_BLOCK;
-       setup.channel = SND_PCM_CHANNEL_PLAYBACK;
-       err_msg="audio setup";
-       if ((rc=snd_pcm_channel_setup(pcm_handle, &setup))<0)
-               goto error;
-
-       memset((dma_t*)shm,0,sizeof(*shm));
-       shm->channels=setup.format.voices;
-       shm->samplepos=0;                                                       // in mono samples
-       shm->samplebits=setup.format.format==SND_PCM_SFMT_S16_LE?16:8;
-       shm->samples=setup.buf.block.frags*setup.buf.block.frag_size/(shm->samplebits/8);       // mono samples in buffer
-       shm->speed=setup.format.rate;
-       shm->buffer=(unsigned char*)mmap_data;
-    Con_Printf("%5d stereo\n", shm->channels - 1);
-    Con_Printf("%5d samples\n", shm->samples);
-    Con_Printf("%5d samplepos\n", shm->samplepos);
-    Con_Printf("%5d samplebits\n", shm->samplebits);
-    Con_Printf("%5d speed\n", shm->speed);
-    Con_Printf("0x%x dma buffer\n", (int)shm->buffer);
-       Con_Printf("%5d total_channels\n", total_channels);
-
-       snd_inited=1;
-       return 1;
- error:
-       Con_Printf("Error: %s: %s\n", err_msg, snd_strerror(rc));
- error_2:
-       snd_pcm_close(pcm_handle);
-       return 0;
-}
-
-int SNDDMA_GetDMAPos(void)
-{
-       if (!snd_inited) return 0;
-       shm->samplepos=(mmap_control->status.frag_io+1)*setup.buf.block.frag_size/(shm->samplebits/8);
-       return shm->samplepos;
-}
-
-void SNDDMA_Shutdown(void)
-{
-       if (snd_inited)
-       {
-               snd_pcm_close(pcm_handle);
-               snd_inited = 0;
-       }
-}
-
-/*
-==============
-SNDDMA_Submit
-
-Send sound to device if buffer isn't really the dma buffer
-===============
-*/
-void SNDDMA_Submit(void)
-{
-       int count=paintedtime-soundtime;
-       int i,s,e;
-       int rc;
-
-       count+=setup.buf.block.frag_size-1;
-       count/=setup.buf.block.frag_size;
-       s=soundtime/setup.buf.block.frag_size;
-       e=s+count;
-       for (i=s; i<e; i++)
-               mmap_control->fragments[i % setup.buf.block.frags].data=1;
-       switch (mmap_control->status.status) {
-       case SND_PCM_STATUS_PREPARED:
-               if ((rc=snd_pcm_channel_go(pcm_handle, SND_PCM_CHANNEL_PLAYBACK))<0) {
-                       fprintf(stderr, "unable to start playback. %s\n",
-                                       snd_strerror(rc));
-                       exit(1);
-               }
-               break;
-       case SND_PCM_STATUS_RUNNING:
-               break;
-       case SND_PCM_STATUS_UNDERRUN:
-               if ((rc=snd_pcm_plugin_prepare(pcm_handle, SND_PCM_CHANNEL_PLAYBACK))<0) {
-                       fprintf(stderr, "underrun: playback channel prepare error. %s\n",
-                                       snd_strerror(rc));
-                       exit(1);
-               }
-               break;
-       default:
-               break;
-       }
-}
-
-void *S_LockBuffer(void)
-{
-       return shm->buffer;
-}
-
-void S_UnlockBuffer(void)
-{
-}
-
diff --git a/snd_alsa_0_9.c b/snd_alsa_0_9.c
deleted file mode 100644 (file)
index dbcdcb0..0000000
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-       snd_alsa_0_9.c
-
-       Support for ALSA 0.9 sound driver (cvs development version)
-
-       Copyright (C) 1999,2000  contributors of the QuakeForge project
-       Please see the file "AUTHORS" for a list of contributors
-
-       This program is free software; you can redistribute it and/or
-       modify it under the terms of the GNU General Public License
-       as published by the Free Software Foundation; either version 2
-       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.
-
-       See the GNU General Public License for more details.
-
-       You should have received a copy of the GNU General Public License
-       along with this program; if not, write to:
-
-               Free Software Foundation, Inc.
-               59 Temple Place - Suite 330
-               Boston, MA  02111-1307, USA
-
-       $Id$
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-
-#include <sys/asoundlib.h>
-
-#include "quakedef.h"
-#include "sound.h"
-#include "console.h"
-
-static int snd_inited;
-
-static snd_pcm_t *pcm;
-static const snd_pcm_channel_area_t *mmap_areas;
-static char *pcmname = NULL;
-size_t buffer_size;
-
-qboolean SNDDMA_Init(void)
-{
-       int err,i;
-       int rate=-1,bps=-1,stereo=-1,frag_size;
-       snd_pcm_hw_params_t *hw;
-       snd_pcm_sw_params_t *sw;
-       snd_pcm_hw_params_alloca(&hw);
-       snd_pcm_sw_params_alloca(&sw);
-
-       if ((i=COM_CheckParm("-sndpcm"))!=0) {
-               pcmname=com_argv[i+1];
-       }
-       if ((i=COM_CheckParm("-sndbits")) != 0) {
-               bps = atoi(com_argv[i+1]);
-               if (bps != 16 && bps != 8) {
-                       Con_Printf("Error: invalid sample bits: %d\n", i);
-                       return 0;
-               }
-       }
-       if ((i=COM_CheckParm("-sndspeed")) != 0) {
-               rate = atoi(com_argv[i+1]);
-               if (rate!=44100 && rate!=22050 && rate!=11025) {
-                       Con_Printf("Error: invalid sample rate: %d\n", rate);
-                       return 0;
-               }
-       }
-       if ((i=COM_CheckParm("-sndmono")) != 0) {
-               stereo=0;
-       }
-       if ((i=COM_CheckParm("-sndstereo")) != 0) {
-               stereo=1;
-       }
-       if (!pcmname)
-               pcmname = "plug:0,0";
-       if ((err=snd_pcm_open(&pcm, pcmname,
-                            SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK))<0) {
-               Con_Printf("Error: audio open error: %s\n", snd_strerror(err));
-               return 0;
-       }
-
-       Con_Printf("Using PCM %s.\n", pcmname);
-       snd_pcm_hw_params_any(pcm, hw);
-
-
-       switch (rate) {
-       case -1:
-               if (snd_pcm_hw_params_set_rate_near(pcm, hw, 44100, 0) >= 0) {
-                       frag_size = 256; /* assuming stereo 8 bit */
-                       rate = 44100;
-               } else if (snd_pcm_hw_params_set_rate_near(pcm, hw, 22050, 0) >= 0) {
-                       frag_size = 128; /* assuming stereo 8 bit */
-                       rate = 22050;
-               } else if (snd_pcm_hw_params_set_rate_near(pcm, hw, 11025, 0) >= 0) {
-                       frag_size = 64; /* assuming stereo 8 bit */
-                       rate = 11025;
-               } else {
-                       Con_Print("ALSA: no useable rates\n");
-                       goto error;
-               }
-               break;
-       case 11025:
-       case 22050:
-       case 44100:
-               if (snd_pcm_hw_params_set_rate_near(pcm, hw, rate, 0) >= 0) {
-                       frag_size = 64 * rate / 11025; /* assuming stereo 8 bit */
-                       break;
-               }
-               /* Fall through */
-       default:
-               Con_Print("ALSA: desired rate not supported\n");
-               goto error;
-       }
-
-       switch (bps) {
-       case -1:
-               if (snd_pcm_hw_params_set_format(pcm, hw, SND_PCM_FORMAT_S16_LE) >= 0) {
-                       bps = 16;
-               } else if (snd_pcm_hw_params_set_format(pcm, hw, SND_PCM_FORMAT_U8) >= 0) {
-                       bps = 8;
-               } else {
-                       Con_Print("ALSA: no useable formats\n");
-                       goto error;
-               }
-               break;
-       case 8:
-       case 16:
-                if (snd_pcm_hw_params_set_format(pcm, hw,
-                                                 bps == 8 ? SND_PCM_FORMAT_U8 :
-                                                 SND_PCM_FORMAT_S16) >= 0) {
-                        break;
-                }
-               /* Fall through */
-       default:
-               Con_Print("ALSA: desired format not supported\n");
-               goto error;
-       }
-
-       if (snd_pcm_hw_params_set_access(pcm, hw,
-                                        SND_PCM_ACCESS_MMAP_INTERLEAVED) < 0) {
-               Con_Print("ALSA: interleaved is not supported\n");
-               goto error;
-       }
-
-       switch (stereo) {
-       case -1:
-               if (snd_pcm_hw_params_set_channels(pcm, hw, 2) >= 0) {
-                       stereo = 1;
-               } else if (snd_pcm_hw_params_set_channels(pcm, hw, 1) >= 0) {
-                       stereo = 0;
-               } else {
-                       Con_Print("ALSA: no useable channels\n");
-                       goto error;
-               }
-               break;
-       case 0:
-       case 1:
-                if (snd_pcm_hw_params_set_channels(pcm, hw, stereo ? 2 : 1) >= 0)
-                        break;
-                /* Fall through */
-       default:
-               Con_Print("ALSA: desired channels not supported\n");
-               goto error;
-       }
-
-       snd_pcm_hw_params_set_period_size_near(pcm, hw, frag_size, 0);
-
-       err = snd_pcm_hw_params(pcm, hw);
-       if (err < 0) {
-               Con_Print("ALSA: unable to install hw params\n");
-               goto error;
-       }
-
-       snd_pcm_sw_params_current(pcm, sw);
-       snd_pcm_sw_params_set_start_mode(pcm, sw, SND_PCM_START_EXPLICIT);
-       snd_pcm_sw_params_set_xrun_mode(pcm, sw, SND_PCM_XRUN_NONE);
-
-       err = snd_pcm_sw_params(pcm, sw);
-       if (err < 0) {
-               Con_Print("ALSA: unable to install sw params\n");
-               goto error;
-       }
-
-       mmap_areas = snd_pcm_mmap_running_areas(pcm);
-
-       memset((dma_t*)shm,0,sizeof(*shm));
-       shm->channels=stereo+1;
-       shm->samplepos=0;                       // in mono samples
-       shm->samplebits=bps;
-       buffer_size = snd_pcm_hw_params_get_buffer_size(hw);
-       shm->samples=buffer_size*shm->channels; // mono samples in buffer
-       shm->speed=rate;
-       shm->buffer=(unsigned char*)mmap_areas->addr;
-       Con_Printf("%5d stereo\n", shm->channels - 1);
-       Con_Printf("%5d samples\n", shm->samples);
-       Con_Printf("%5d samplepos\n", shm->samplepos);
-       Con_Printf("%5d samplebits\n", shm->samplebits);
-       Con_Printf("%5d speed\n", shm->speed);
-       Con_Printf("0x%x dma buffer\n", (int)shm->buffer);
-       Con_Printf("%5d total_channels\n", total_channels);
-
-       snd_inited=1;
-       return 1;
- error:
-       snd_pcm_close(pcm);
-       return 0;
-}
-
-static inline int
-get_hw_ptr(void)
-{
-       size_t app_ptr;
-       snd_pcm_sframes_t delay;
-       int hw_ptr;
-
-       if (snd_pcm_state (pcm) != SND_PCM_STATE_RUNNING)
-               return 0;
-       app_ptr = snd_pcm_mmap_offset (pcm);
-       snd_pcm_delay (pcm, &delay);
-       hw_ptr = app_ptr - delay;
-       if (hw_ptr < 0)
-               hw_ptr += buffer_size;
-       return hw_ptr;
-}
-
-int SNDDMA_GetDMAPos(void)
-{
-       int hw_ptr;
-
-       if (!snd_inited) return 0;
-
-       hw_ptr = get_hw_ptr();
-       hw_ptr *= shm->channels;
-       shm->samplepos = hw_ptr;
-       return shm->samplepos;
-}
-
-void SNDDMA_Shutdown(void)
-{
-       if (snd_inited)
-       {
-               snd_pcm_close(pcm);
-               snd_inited = 0;
-       }
-}
-
-/*
-==============
-SNDDMA_Submit
-
-Send sound to device if buffer isn't really the dma buffer
-===============
-*/
-void SNDDMA_Submit(void)
-{
-       int count = paintedtime - soundtime;
-       int avail;
-       int missed;
-       int state;
-       int hw_ptr;
-       int offset;
-
-       state = snd_pcm_state (pcm);
-
-       switch (state) {
-       case SND_PCM_STATE_PREPARED:
-               snd_pcm_mmap_forward (pcm, count);
-               snd_pcm_start (pcm);
-               break;
-       case SND_PCM_STATE_RUNNING:
-               hw_ptr = get_hw_ptr();
-               missed = hw_ptr - shm->samplepos / shm->channels;
-               if (missed < 0)
-                       missed += buffer_size;
-               count -= missed;
-               offset = snd_pcm_mmap_offset (pcm);
-               if (offset > hw_ptr)
-                       count -= (offset - hw_ptr);
-               else
-                       count -= (buffer_size - hw_ptr + offset);
-               if (count < 0) {
-                       snd_pcm_rewind (pcm, -count);
-               } else {
-                       avail = snd_pcm_avail_update(pcm);
-                       if (avail < 0)
-                               avail = buffer_size;
-                       if (count > avail)
-                               count = avail;
-                       snd_pcm_mmap_forward (pcm, count);
-               }
-               break;
-       default:
-               break;
-       }
-}
-
-void *S_LockBuffer(void)
-{
-       return shm->buffer;
-}
-
-void S_UnlockBuffer(void)
-{
-}
-