[Qemu-devel] [PATCH] alsa: fix warning

[Qemu-devel] [PATCH] alsa: fix warning

[Gerd Hoffmann]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 audio/alsaaudio.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
index 2f6c764..f0752bc 100644
--- a/audio/alsaaudio.c
+++ b/audio/alsaaudio.c
@@ -626,8 +626,7 @@ 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 ? 0x03 : 0x00;
 
     if (alsa_open (0, &req, &obt, &handle)) {
         return -1;
@@ -706,8 +705,7 @@ 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 ? 0x03 : 0x00;
 
     if (alsa_open (1, &req, &obt, &handle)) {
         return -1;
-- 
1.6.2.2

Re: [Qemu-devel] [PATCH] alsa: fix warning

[Filip Navara]

[-- Attachment #1: Type: text/plain, Size: 1497 bytes --]

On Wed, Jun 17, 2009 at 12:47 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:

>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  audio/alsaaudio.c |    6 ++----
>  1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c
> index 2f6c764..f0752bc 100644
> --- a/audio/alsaaudio.c
> +++ b/audio/alsaaudio.c
> @@ -626,8 +626,7 @@ 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 ? 0x03 : 0x00;


I'm all for fixing warnings, but this changes the
functionality, buffer_size_out_overridden != period_size_out_overridden. I
don't think that was the intent, otherwise please state so in the patch
description.


>
>
>     if (alsa_open (0, &req, &obt, &handle)) {
>         return -1;
> @@ -706,8 +705,7 @@ 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 ? 0x03 : 0x00;


Same here.

F.

[-- Attachment #2: Type: text/html, Size: 2217 bytes --]