OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

oss: refactor code around policy setting 

This fixes a problem with a previous patch spotted by Juergen Lock,
thanks to him again.

Signed-off-by: malc <av1474@comtv.ru>
This commit is contained in:
malc 2010-01-09 00:28:40 +03:00
parent 25d0ae900f
commit 78d9356d3c
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
audio/ossaudio.c
View File

@ -38,6 +38,10 @@
#define AUDIO_CAP "oss" #define AUDIO_CAP "oss"
#include "audio_int.h" #include "audio_int.h"
#if defined OSS_GETVERSION && defined SNDCTL_DSP_POLICY
#define USE_DSP_POLICY
#endif
typedef struct OSSVoiceOut { typedef struct OSSVoiceOut {
HWVoiceOut hw; HWVoiceOut hw;
void *pcm_buf; void *pcm_buf;
@ -240,7 +244,7 @@ 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 #ifdef USE_DSP_POLICY
int version; int version;
#endif #endif
int oflags = conf.exclusive ? O_EXCL : 0; int oflags = conf.exclusive ? O_EXCL : 0;
@ -283,7 +287,7 @@ static int oss_open (int in, struct oss_params *req,
goto err; goto err;
} }
#ifdef OSS_GETVERSION #ifdef USE_DSP_POLICY
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;
@ -292,16 +296,8 @@ 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 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)) {
@ -868,7 +864,7 @@ static struct audio_option oss_options[] = {
.valp = &conf.exclusive, .valp = &conf.exclusive,
.descr = "Open device in exclusive mode (vmix wont work)" .descr = "Open device in exclusive mode (vmix wont work)"
}, },
#ifdef SNDCTL_DSP_POLICY #ifdef USE_DSP_POLICY
{ {
.name = "POLICY", .name = "POLICY",
.tag = AUD_OPT_INT, .tag = AUD_OPT_INT,