qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 14:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

get alsa and sdl working, though sdl seems to be mono only

Browse source
This commit is contained in:
Bill Currie 2010-08-15 05:15:47 +00:00 committed by Jeff Teunissen
parent bc4a3e79dc
commit 4449f10c0a
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libs/audio/renderer/snd_dma.c
View file

@ -81,8 +81,8 @@ s_xfer_paint_buffer (int endtime)
p = (float *) snd_paintbuffer; p = (float *) snd_paintbuffer;
count = (endtime - snd_paintedtime) * snd_shm->channels; count = (endtime - snd_paintedtime) * snd_shm->channels;
out_mask = snd_shm->frames - 1; out_mask = (snd_shm->frames * snd_shm->channels) - 1;
out_idx = snd_paintedtime * snd_shm->channels & out_mask; out_idx = (snd_paintedtime * snd_shm->channels) & out_mask;
step = 3 - snd_shm->channels; step = 3 - snd_shm->channels;
snd_vol = snd_volume->value; snd_vol = snd_volume->value;

2
libs/audio/targets/snd_alsa.c
View file

@ -405,7 +405,7 @@ SNDDMA_Submit (void)
if (snd_blocked) if (snd_blocked)
return; return;
nframes = count / sn.channels; nframes = count;
qfsnd_pcm_avail_update (pcm); qfsnd_pcm_avail_update (pcm);
qfsnd_pcm_mmap_begin (pcm, &areas, &offset, &nframes); qfsnd_pcm_mmap_begin (pcm, &areas, &offset, &nframes);

2
libs/audio/targets/snd_oss.c
View file

@ -326,7 +326,7 @@ SNDDMA_GetDMAPos (void)
} }
// sn.samplepos = (count.bytes / (sn.samplebits / 8)) & (sn.samples-1); // sn.samplepos = (count.bytes / (sn.samplebits / 8)) & (sn.samples-1);
// fprintf(stderr, "%d \r", count.ptr); // fprintf(stderr, "%d \r", count.ptr);
sn.framepos = count.ptr / (sn.samplebits / 8) / sn.channels; //XXX??? sn.framepos = count.ptr / (sn.samplebits / 8);
return sn.framepos; return sn.framepos;

6
libs/audio/testsound.c
View file

@ -109,11 +109,11 @@ main (int argc, const char *argv[])
COM_InitArgv (argc, argv); COM_InitArgv (argc, argv);
init (); init ();
Cbuf_Execute_Stack (testsound_cbuf); Cbuf_Execute_Stack (testsound_cbuf);
// while (1) { while (1) {
Cbuf_Execute_Stack (testsound_cbuf); Cbuf_Execute_Stack (testsound_cbuf);
S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin); S_Update (vec3_origin, vec3_origin, vec3_origin, vec3_origin);
sleep(100); usleep(20 * 1000);
// } }
Sys_Quit (); Sys_Quit ();
} }