summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-06-17 13:51:20 +0200
committermalc <av1474@comtv.ru>2009-06-18 22:57:48 +0400
commit97f155ddb79b9a270585d370f1581683334d8b9b (patch)
treec0a1b6137ca0ce320b5b13d5d466c6f266a55295 /audio
parentb20a0083a12f1a9d2dde1b15ac7140268115283c (diff)
downloadqemu-97f155ddb79b9a270585d370f1581683334d8b9b.tar.gz
qemu-97f155ddb79b9a270585d370f1581683334d8b9b.tar.bz2
qemu-97f155ddb79b9a270585d370f1581683334d8b9b.zip
alsa: fix warning
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'audio')
-rw-r--r--audio/alsaaudio.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 2f6c764dca..f1d573a8fa 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -626,8 +626,9 @@ static int alsa_init_out (HWVoiceOut *hw, struct audsettings *as)
req.period_size = conf.period_size_out;
req.buffer_size = conf.buffer_size_out;
req.size_in_usec = conf.size_in_usec_out;
- req.override_mask = !!conf.period_size_out_overridden
- | (!!conf.buffer_size_out_overridden << 1);
+ req.override_mask =
+ (conf.period_size_out_overridden ? 1 : 0) |
+ (conf.buffer_size_out_overridden ? 2 : 0);
if (alsa_open (0, &req, &obt, &handle)) {
return -1;
@@ -706,8 +707,9 @@ static int alsa_init_in (HWVoiceIn *hw, struct audsettings *as)
req.period_size = conf.period_size_in;
req.buffer_size = conf.buffer_size_in;
req.size_in_usec = conf.size_in_usec_in;
- req.override_mask = !!conf.period_size_in_overridden
- | (!!conf.buffer_size_in_overridden << 1);
+ req.override_mask =
+ (conf.period_size_in_overridden ? 1 : 0) |
+ (conf.buffer_size_in_overridden ? 2 : 0);
if (alsa_open (1, &req, &obt, &handle)) {
return -1;