ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

oss: workaround for cases when OSS_GETVERSION is not defined 

Thanks to Juergen Lock.

Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
malc 2010-01-08 11:26:27 +03:00
parent 95372a393d
commit e726fe7d60
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/ossaudio.c
View File

@ -240,7 +240,9 @@ static int oss_open (int in, struct oss_params *req,
struct oss_params *obt, int *pfd) struct oss_params *obt, int *pfd)
{ {
int fd; int fd;
#ifdef OSS_GETVERSION
int version; int version;
#endif
int oflags = conf.exclusive ? O_EXCL : 0; int oflags = conf.exclusive ? O_EXCL : 0;
audio_buf_info abinfo; audio_buf_info abinfo;
int fmt, freq, nchannels; int fmt, freq, nchannels;
@ -281,6 +283,7 @@ static int oss_open (int in, struct oss_params *req,
goto err; goto err;
} }
#ifdef OSS_GETVERSION
if (ioctl (fd, OSS_GETVERSION, &version)) { if (ioctl (fd, OSS_GETVERSION, &version)) {
oss_logerr2 (errno, typ, "Failed to get OSS version\n"); oss_logerr2 (errno, typ, "Failed to get OSS version\n");
version = 0; version = 0;
@ -289,9 +292,17 @@ static int oss_open (int in, struct oss_params *req,
if (conf.debug) { if (conf.debug) {
dolog ("OSS version = %#x\n", version); dolog ("OSS version = %#x\n", version);
} }
#endif
#ifdef SNDCTL_DSP_POLICY #ifdef SNDCTL_DSP_POLICY
if (conf.policy >= 0 && version >= 0x040000) { if (conf.policy >= 0
#ifdef OSS_GETVERSION
&& version >= 0x040000
#else
0
#endif
)
{
int policy = conf.policy; int policy = conf.policy;
if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) { if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) {
oss_logerr2 (errno, typ, "Failed to set timing policy to %d\n", oss_logerr2 (errno, typ, "Failed to set timing policy to %d\n",