qf/nuq
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/nuq synced 2025-02-12 15:15:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

once again works with latest alsa cvs

Browse source
This commit is contained in:
Bill Currie 2000-09-26 18:50:00 +00:00
parent a65b0fef6d
commit ad7c97b4fc
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
source/snd_alsa_0_6.c
View file

@ -66,7 +66,6 @@
static int snd_inited; static int snd_inited;
static snd_pcm_t *pcm_handle; static snd_pcm_t *pcm_handle;
static snd_pcm_info_t cinfo;
static snd_pcm_params_info_t cpinfo; static snd_pcm_params_info_t cpinfo;
static snd_pcm_params_t params; static snd_pcm_params_t params;
static snd_pcm_setup_t setup; static snd_pcm_setup_t setup;
@ -75,6 +74,10 @@ static snd_pcm_mmap_status_t *mmap_status = NULL;
static char *mmap_data = NULL; static char *mmap_data = NULL;
static int card=-1,dev=-1,subdev=-1;; static int card=-1,dev=-1,subdev=-1;;
//XXX ugh, not defined in asoundlib.h
int snd_pcm_mmap_status(snd_pcm_t *pcm, snd_pcm_mmap_status_t **status);
int snd_pcm_mmap_control(snd_pcm_t *pcm, snd_pcm_mmap_control_t **control);
int check_card(int card) int check_card(int card)
{ {
snd_ctl_t *handle; snd_ctl_t *handle;
@ -183,11 +186,9 @@ qboolean SNDDMA_Init(void)
dev_openned: dev_openned:
Con_Printf("Using card %d, device %d.\n", card, dev); Con_Printf("Using card %d, device %d.\n", card, dev);
memset(&cinfo, 0, sizeof(cinfo));
snd_pcm_info(pcm_handle, &cinfo);
memset(&cpinfo, 0, sizeof(cpinfo)); memset(&cpinfo, 0, sizeof(cpinfo));
snd_pcm_params_info(pcm_handle, &cpinfo); snd_pcm_params_info(pcm_handle, &cpinfo);
Con_Printf("%08x %08x %08x\n",cinfo.flags,cpinfo.formats,cpinfo.rates); Con_Printf("%08x %08x %08x\n",cpinfo.flags,cpinfo.formats,cpinfo.rates);
if ((rate==-1 || rate==44100) && cpinfo.rates & SND_PCM_RATE_44100) { if ((rate==-1 || rate==44100) && cpinfo.rates & SND_PCM_RATE_44100) {
rate=44100; rate=44100;
frag_size=256; /* assuming stereo 8 bit */ frag_size=256; /* assuming stereo 8 bit */
@ -214,7 +215,7 @@ qboolean SNDDMA_Init(void)
goto error_2; goto error_2;
} }
//XXX can't support non-interleaved stereo //XXX can't support non-interleaved stereo
if (stereo && (cinfo.flags & SND_PCM_INFO_INTERLEAVE) && cpinfo.max_channels>=2) { if (stereo && (cpinfo.flags & SND_PCM_INFO_INTERLEAVED) && cpinfo.max_channels>=2) {
stereo=1; stereo=1;
frame_size*=2; frame_size*=2;
} else { } else {
@ -222,22 +223,20 @@ qboolean SNDDMA_Init(void)
} }
memset(&params, 0, sizeof(params)); memset(&params, 0, sizeof(params));
params.mode = SND_PCM_MODE_FRAME; //XXX can't support non-interleaved stereo
params.format.interleave=stereo;//XXX can't support non-interleaved stereo params.xfer_mode = stereo ? SND_PCM_XFER_INTERLEAVED
params.format.format=format; : SND_PCM_XFER_NONINTERLEAVED;
params.format.sfmt=format;
params.format.rate=rate; params.format.rate=rate;
params.format.channels=stereo+1; params.format.channels=stereo+1;
params.start_mode = SND_PCM_START_GO; params.start_mode = SND_PCM_START_EXPLICIT;
params.xrun_mode = SND_PCM_XRUN_RESTART; params.xrun_mode = SND_PCM_XRUN_NONE;
params.buffer_size = (2<<16) / frame_size; params.buffer_size = (2<<16) / frame_size;
params.frag_size=frag_size; params.frag_size=frag_size;
params.avail_min = frag_size; params.avail_min = frag_size;
params.align = frag_size;
params.xrun_max = 1024; params.xrun_max = 1024;
params.fill_mode = SND_PCM_FILL_SILENCE;
params.fill_max = 1024;
params.boundary = params.buffer_size; params.boundary = params.buffer_size;
while (1) { while (1) {
@ -255,7 +254,11 @@ qboolean SNDDMA_Init(void)
} }
err_msg="audio mmap"; err_msg="audio mmap";
if ((rc=snd_pcm_mmap(pcm_handle, &mmap_status, &mmap_control, (void **)&mmap_data))<0) if ((rc=snd_pcm_mmap(pcm_handle, (void**)&mmap_data))<0)
goto error;
if ((rc=snd_pcm_mmap_status(pcm_handle, &mmap_status))<0)
goto error;
if ((rc=snd_pcm_mmap_control(pcm_handle, &mmap_control))<0)
goto error; goto error;
err_msg="audio prepare"; err_msg="audio prepare";
if ((rc=snd_pcm_prepare(pcm_handle))<0) if ((rc=snd_pcm_prepare(pcm_handle))<0)
@ -267,7 +270,7 @@ qboolean SNDDMA_Init(void)
shm->channels=setup.format.channels; shm->channels=setup.format.channels;
shm->submission_chunk=frag_size; // don't mix less than this # shm->submission_chunk=frag_size; // don't mix less than this #
shm->samplepos=0; // in mono samples shm->samplepos=0; // in mono samples
shm->samplebits=setup.format.format==SND_PCM_SFMT_S16_LE?16:8; shm->samplebits=setup.format.sfmt==SND_PCM_SFMT_S16_LE?16:8;
shm->samples=setup.buffer_size*shm->channels; // mono samples in buffer shm->samples=setup.buffer_size*shm->channels; // mono samples in buffer
shm->speed=setup.format.rate; shm->speed=setup.format.rate;
shm->buffer=(unsigned char*)mmap_data; shm->buffer=(unsigned char*)mmap_data;
@ -293,7 +296,7 @@ int SNDDMA_GetDMAPos(void)
{ {
size_t hw_ptr; size_t hw_ptr;
if (!snd_inited) return 0; if (!snd_inited) return 0;
hw_ptr = snd_pcm_hw_ptr (pcm_handle, 1); hw_ptr = mmap_status->hw_ptr;
//printf("%7d %7d\n", mmap_control->appl_ptr, hw_ptr); //printf("%7d %7d\n", mmap_control->appl_ptr, hw_ptr);
hw_ptr *= shm->channels; hw_ptr *= shm->channels;
shm->samplepos = hw_ptr; shm->samplepos = hw_ptr;
@ -324,7 +327,7 @@ void SNDDMA_Submit(void)
mmap_control->appl_ptr=mmap_status->hw_ptr+count; mmap_control->appl_ptr=mmap_status->hw_ptr+count;
switch (mmap_status->state) { switch (mmap_status->state) {
case SND_PCM_STATE_PREPARED: case SND_PCM_STATE_PREPARED:
if ((rc=snd_pcm_go(pcm_handle))<0) { if ((rc=snd_pcm_start(pcm_handle))<0) {
fprintf(stderr, "unable to start playback. %s\n", fprintf(stderr, "unable to start playback. %s\n",
snd_strerror(rc)); snd_strerror(rc));
exit(1); exit(1);