slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix logic in QAudioDeviceInfoInternal::updateLists()

Browse Source 
Task-number: QTBUG-20482

Change-Id: I0dd59a0388965726eb8cfd36a8549250916d999a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Kent Hansen
2011-10-05 14:20:22 +02:00
committed by Qt by Nokia
parent 0ba1c8f4f6
commit 18dc690a19
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
View File

@@ -309,60 +309,60 @@ void QAudioDeviceInfoInternal::updateLists()
codecz.clear(); codecz.clear();
if(match) { if(match) {
if((fmt && WAVE_FORMAT_1M08) if ((fmt & WAVE_FORMAT_1M08)
|| (fmt && WAVE_FORMAT_1S08) || (fmt & WAVE_FORMAT_1S08)
|| (fmt && WAVE_FORMAT_2M08) || (fmt & WAVE_FORMAT_2M08)
|| (fmt && WAVE_FORMAT_2S08) || (fmt & WAVE_FORMAT_2S08)
|| (fmt && WAVE_FORMAT_4M08) || (fmt & WAVE_FORMAT_4M08)
|| (fmt && WAVE_FORMAT_4S08) || (fmt & WAVE_FORMAT_4S08)
|| (fmt && WAVE_FORMAT_48M08) || (fmt & WAVE_FORMAT_48M08)
|| (fmt && WAVE_FORMAT_48S08) || (fmt & WAVE_FORMAT_48S08)
|| (fmt && WAVE_FORMAT_96M08) || (fmt & WAVE_FORMAT_96M08)
|| (fmt && WAVE_FORMAT_96S08) || (fmt & WAVE_FORMAT_96S08)
) { ) {
sizez.append(8); sizez.append(8);
} }
if((fmt && WAVE_FORMAT_1M16) if ((fmt & WAVE_FORMAT_1M16)
|| (fmt && WAVE_FORMAT_1S16) || (fmt & WAVE_FORMAT_1S16)
|| (fmt && WAVE_FORMAT_2M16) || (fmt & WAVE_FORMAT_2M16)
|| (fmt && WAVE_FORMAT_2S16) || (fmt & WAVE_FORMAT_2S16)
|| (fmt && WAVE_FORMAT_4M16) || (fmt & WAVE_FORMAT_4M16)
|| (fmt && WAVE_FORMAT_4S16) || (fmt & WAVE_FORMAT_4S16)
|| (fmt && WAVE_FORMAT_48M16) || (fmt & WAVE_FORMAT_48M16)
|| (fmt && WAVE_FORMAT_48S16) || (fmt & WAVE_FORMAT_48S16)
|| (fmt && WAVE_FORMAT_96M16) || (fmt & WAVE_FORMAT_96M16)
|| (fmt && WAVE_FORMAT_96S16) || (fmt & WAVE_FORMAT_96S16)
) { ) {
sizez.append(16); sizez.append(16);
} }
if((fmt && WAVE_FORMAT_1M08) if ((fmt & WAVE_FORMAT_1M08)
|| (fmt && WAVE_FORMAT_1S08) || (fmt & WAVE_FORMAT_1S08)
|| (fmt && WAVE_FORMAT_1M16) || (fmt & WAVE_FORMAT_1M16)
|| (fmt && WAVE_FORMAT_1S16)) { || (fmt & WAVE_FORMAT_1S16)) {
freqz.append(11025); freqz.append(11025);
} }
if((fmt && WAVE_FORMAT_2M08) if ((fmt & WAVE_FORMAT_2M08)
|| (fmt && WAVE_FORMAT_2S08) || (fmt & WAVE_FORMAT_2S08)
|| (fmt && WAVE_FORMAT_2M16) || (fmt & WAVE_FORMAT_2M16)
|| (fmt && WAVE_FORMAT_2S16)) { || (fmt & WAVE_FORMAT_2S16)) {
freqz.append(22050); freqz.append(22050);
} }
if((fmt && WAVE_FORMAT_4M08) if ((fmt & WAVE_FORMAT_4M08)
|| (fmt && WAVE_FORMAT_4S08) || (fmt & WAVE_FORMAT_4S08)
|| (fmt && WAVE_FORMAT_4M16) || (fmt & WAVE_FORMAT_4M16)
|| (fmt && WAVE_FORMAT_4S16)) { || (fmt & WAVE_FORMAT_4S16)) {
freqz.append(44100); freqz.append(44100);
} }
if((fmt && WAVE_FORMAT_48M08) if ((fmt & WAVE_FORMAT_48M08)
|| (fmt && WAVE_FORMAT_48S08) || (fmt & WAVE_FORMAT_48S08)
|| (fmt && WAVE_FORMAT_48M16) || (fmt & WAVE_FORMAT_48M16)
|| (fmt && WAVE_FORMAT_48S16)) { || (fmt & WAVE_FORMAT_48S16)) {
freqz.append(48000); freqz.append(48000);
} }
if((fmt && WAVE_FORMAT_96M08) if ((fmt & WAVE_FORMAT_96M08)
|| (fmt && WAVE_FORMAT_96S08) || (fmt & WAVE_FORMAT_96S08)
|| (fmt && WAVE_FORMAT_96M16) || (fmt & WAVE_FORMAT_96M16)
|| (fmt && WAVE_FORMAT_96S16)) { || (fmt & WAVE_FORMAT_96S16)) {
freqz.append(96000); freqz.append(96000);
} }
channelz.append(1); channelz.append(1);