From 18dc690a193c50aeb34602bf37cf37449027eb82 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 5 Oct 2011 14:20:22 +0200
Subject: [PATCH] Fix logic in QAudioDeviceInfoInternal::updateLists()

Task-number: QTBUG-20482

Change-Id: I0dd59a0388965726eb8cfd36a8549250916d999a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
---
 .../audio/qaudiodeviceinfo_win32_p.cpp        | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index 10b9b777..8cdeb6d6 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -309,60 +309,60 @@ void QAudioDeviceInfoInternal::updateLists()
     codecz.clear();
 
     if(match) {
-        if((fmt && WAVE_FORMAT_1M08)
-           || (fmt && WAVE_FORMAT_1S08)
-	   || (fmt && WAVE_FORMAT_2M08)
-	   || (fmt && WAVE_FORMAT_2S08)
-	   || (fmt && WAVE_FORMAT_4M08)
-	   || (fmt && WAVE_FORMAT_4S08)
-	   || (fmt && WAVE_FORMAT_48M08)
-	   || (fmt && WAVE_FORMAT_48S08)
-	   || (fmt && WAVE_FORMAT_96M08)
-	   || (fmt && WAVE_FORMAT_96S08)
+        if ((fmt & WAVE_FORMAT_1M08)
+            || (fmt & WAVE_FORMAT_1S08)
+            || (fmt & WAVE_FORMAT_2M08)
+            || (fmt & WAVE_FORMAT_2S08)
+            || (fmt & WAVE_FORMAT_4M08)
+            || (fmt & WAVE_FORMAT_4S08)
+            || (fmt & WAVE_FORMAT_48M08)
+            || (fmt & WAVE_FORMAT_48S08)
+            || (fmt & WAVE_FORMAT_96M08)
+            || (fmt & WAVE_FORMAT_96S08)
        ) {
             sizez.append(8);
 	}
-        if((fmt && WAVE_FORMAT_1M16)
-           || (fmt && WAVE_FORMAT_1S16)
-	   || (fmt && WAVE_FORMAT_2M16)
-	   || (fmt && WAVE_FORMAT_2S16)
-	   || (fmt && WAVE_FORMAT_4M16)
-	   || (fmt && WAVE_FORMAT_4S16)
-	   || (fmt && WAVE_FORMAT_48M16)
-	   || (fmt && WAVE_FORMAT_48S16)
-	   || (fmt && WAVE_FORMAT_96M16)
-	   || (fmt && WAVE_FORMAT_96S16)
+        if ((fmt & WAVE_FORMAT_1M16)
+            || (fmt & WAVE_FORMAT_1S16)
+            || (fmt & WAVE_FORMAT_2M16)
+            || (fmt & WAVE_FORMAT_2S16)
+            || (fmt & WAVE_FORMAT_4M16)
+            || (fmt & WAVE_FORMAT_4S16)
+            || (fmt & WAVE_FORMAT_48M16)
+            || (fmt & WAVE_FORMAT_48S16)
+            || (fmt & WAVE_FORMAT_96M16)
+            || (fmt & WAVE_FORMAT_96S16)
        ) {
             sizez.append(16);
 	}
-        if((fmt && WAVE_FORMAT_1M08)
-           || (fmt && WAVE_FORMAT_1S08)
-	   || (fmt && WAVE_FORMAT_1M16)
-	   || (fmt && WAVE_FORMAT_1S16)) {
+        if ((fmt & WAVE_FORMAT_1M08)
+           || (fmt & WAVE_FORMAT_1S08)
+           || (fmt & WAVE_FORMAT_1M16)
+           || (fmt & WAVE_FORMAT_1S16)) {
             freqz.append(11025);
 	}
-        if((fmt && WAVE_FORMAT_2M08)
-           || (fmt && WAVE_FORMAT_2S08)
-	   || (fmt && WAVE_FORMAT_2M16)
-	   || (fmt && WAVE_FORMAT_2S16)) {
+        if ((fmt & WAVE_FORMAT_2M08)
+           || (fmt & WAVE_FORMAT_2S08)
+           || (fmt & WAVE_FORMAT_2M16)
+           || (fmt & WAVE_FORMAT_2S16)) {
             freqz.append(22050);
 	}
-        if((fmt && WAVE_FORMAT_4M08)
-           || (fmt && WAVE_FORMAT_4S08)
-	   || (fmt && WAVE_FORMAT_4M16)
-	   || (fmt && WAVE_FORMAT_4S16)) {
+        if ((fmt & WAVE_FORMAT_4M08)
+           || (fmt & WAVE_FORMAT_4S08)
+           || (fmt & WAVE_FORMAT_4M16)
+           || (fmt & WAVE_FORMAT_4S16)) {
             freqz.append(44100);
 	}
-        if((fmt && WAVE_FORMAT_48M08)
-           || (fmt && WAVE_FORMAT_48S08)
-	   || (fmt && WAVE_FORMAT_48M16)
-	   || (fmt && WAVE_FORMAT_48S16)) {
+        if ((fmt & WAVE_FORMAT_48M08)
+            || (fmt & WAVE_FORMAT_48S08)
+            || (fmt & WAVE_FORMAT_48M16)
+            || (fmt & WAVE_FORMAT_48S16)) {
             freqz.append(48000);
 	}
-        if((fmt && WAVE_FORMAT_96M08)
-           || (fmt && WAVE_FORMAT_96S08)
-	   || (fmt && WAVE_FORMAT_96M16)
-	   || (fmt && WAVE_FORMAT_96S16)) {
+        if ((fmt & WAVE_FORMAT_96M08)
+           || (fmt & WAVE_FORMAT_96S08)
+           || (fmt & WAVE_FORMAT_96M16)
+           || (fmt & WAVE_FORMAT_96S16)) {
             freqz.append(96000);
         }
 	channelz.append(1);