From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MGtfu-0000le-Je for qemu-devel@nongnu.org; Wed, 17 Jun 2009 07:51:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MGtfq-0000eN-UX for qemu-devel@nongnu.org; Wed, 17 Jun 2009 07:51:30 -0400 Received: from [199.232.76.173] (port=44891 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MGtfq-0000e0-O4 for qemu-devel@nongnu.org; Wed, 17 Jun 2009 07:51:26 -0400 Received: from mx2.redhat.com ([66.187.237.31]:54989) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MGtfq-0003qN-9F for qemu-devel@nongnu.org; Wed, 17 Jun 2009 07:51:26 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5HBpPCV024574 for ; Wed, 17 Jun 2009 07:51:25 -0400 From: Gerd Hoffmann Date: Wed, 17 Jun 2009 13:51:20 +0200 Message-Id: <1245239480-23687-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2] alsa: fix warning List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- audio/alsaaudio.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 2f6c764..f1d573a 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; -- 1.6.2.2