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

fix oss' device openning mode. defaults to write only, but read/write can be

Browse source 
selected by setting snd_oss_rw (need better name?) to non-zero
This commit is contained in:
Bill Currie 2001-05-16 18:59:31 +00:00
parent 35a52bb634
commit d16dc87dfa
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/QF/sound.h
View file

@ -182,6 +182,7 @@ extern cvar_t *bgmvolume;
extern cvar_t *volume; extern cvar_t *volume;
extern cvar_t *snd_device; extern cvar_t *snd_device;
extern cvar_t *snd_oss_rw;
extern cvar_t *snd_rate; extern cvar_t *snd_rate;
extern cvar_t *snd_bits; extern cvar_t *snd_bits;
extern cvar_t *snd_stereo; extern cvar_t *snd_stereo;

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

@ -100,6 +100,7 @@ extern cvar_t *bgmvolume;
extern cvar_t *volume; extern cvar_t *volume;
cvar_t *snd_device; cvar_t *snd_device;
cvar_t *snd_oss_rw;
cvar_t *snd_rate; cvar_t *snd_rate;
cvar_t *snd_bits; cvar_t *snd_bits;
cvar_t *snd_stereo; cvar_t *snd_stereo;
@ -275,6 +276,9 @@ S_Init_Cvars (void)
{ {
snd_device = Cvar_Get ("snd_device", "", CVAR_ROM, NULL, snd_device = Cvar_Get ("snd_device", "", CVAR_ROM, NULL,
"sound device. \"\" is system default"); "sound device. \"\" is system default");
snd_oss_rw = Cvar_Get ("snd_oss_rw", "0", CVAR_ROM, NULL,
"open the oss device in r/w mode instead of w/o"
" (for braindead(?) drivers)");
snd_rate = Cvar_Get ("snd_rate", "0", CVAR_ROM, NULL, snd_rate = Cvar_Get ("snd_rate", "0", CVAR_ROM, NULL,
"sound playback rate. 0 is system default"); "sound playback rate. 0 is system default");
snd_bits = Cvar_Get ("snd_bits", "0", CVAR_ROM, NULL, snd_bits = Cvar_Get ("snd_bits", "0", CVAR_ROM, NULL,

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

@ -80,6 +80,7 @@ SNDDMA_Init (void)
struct audio_buf_info info; struct audio_buf_info info;
int caps; int caps;
int retries = 3; int retries = 3;
int omode = O_WRONLY;
snd_inited = 0; snd_inited = 0;
@ -87,7 +88,10 @@ SNDDMA_Init (void)
if (snd_device->string[0]) if (snd_device->string[0])
snd_dev = snd_device->string; snd_dev = snd_device->string;
audio_fd = open (snd_dev, O_RDWR); if (snd_oss_rw->int_val)
omode = O_RDWR;
audio_fd = open (snd_dev, omode);
if (audio_fd < 0) { // Failed open, retry up to 3 times if (audio_fd < 0) { // Failed open, retry up to 3 times
// if it's busy // if it's busy
while ((audio_fd < 0) && retries-- && while ((audio_fd < 0) && retries-- &&