diff options
| author |   malc <av1474@comtv.ru> | 2010-01-09 00:28:40 +0300 |
|---|---|---|
| committer |   Aurelien Jarno <aurelien@aurel32.net> | 2010-04-25 12:19:48 +0200 |
| commit | 8f30db54d9de358146fe549315daebf66dad7a82 (patch) | |
| tree | 6bd0c9cfd157121f17082e6d1ad9fdbdb929b919 | |
| parent | oss: workaround for cases when OSS_GETVERSION is not defined (diff) | |
| download | qemu-kvm-8f30db54d9de358146fe549315daebf66dad7a82.tar.gz qemu-kvm-8f30db54d9de358146fe549315daebf66dad7a82.tar.bz2 qemu-kvm-8f30db54d9de358146fe549315daebf66dad7a82.zip | |
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>
(cherry picked from commit 78d9356d3caad95a74bc9cd65eea5fc7e050c35d)
| -rw-r--r-- | audio/ossaudio.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/audio/ossaudio.c b/audio/ossaudio.c index 4766aa725..fe6fb523b 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -38,6 +38,10 @@ #define AUDIO_CAP "oss" #include "audio_int.h" +#if defined OSS_GETVERSION && defined SNDCTL_DSP_POLICY +#define USE_DSP_POLICY +#endif + typedef struct OSSVoiceOut { HWVoiceOut hw; void *pcm_buf; @@ -240,7 +244,7 @@ static int oss_open (int in, struct oss_params *req, struct oss_params *obt, int *pfd) { int fd; -#ifdef OSS_GETVERSION +#ifdef USE_DSP_POLICY int version; #endif int oflags = conf.exclusive ? O_EXCL : 0; @@ -283,7 +287,7 @@ static int oss_open (int in, struct oss_params *req, goto err; } -#ifdef OSS_GETVERSION +#ifdef USE_DSP_POLICY if (ioctl (fd, OSS_GETVERSION, &version)) { oss_logerr2 (errno, typ, "Failed to get OSS version\n"); version = 0; @@ -292,16 +296,8 @@ static int oss_open (int in, struct oss_params *req, if (conf.debug) { dolog ("OSS version = %#x\n", version); } -#endif -#ifdef SNDCTL_DSP_POLICY - if (conf.policy >= 0 -#ifdef OSS_GETVERSION - && version >= 0x040000 -#else - 0 -#endif - ) + if (conf.policy >= 0 && version >= 0x040000) { int policy = conf.policy; if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) { @@ -868,7 +864,7 @@ static struct audio_option oss_options[] = { .valp = &conf.exclusive, .descr = "Open device in exclusive mode (vmix wont work)" }, -#ifdef SNDCTL_DSP_POLICY +#ifdef USE_DSP_POLICY { .name = "POLICY", .tag = AUD_OPT_INT, |