diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-04 03:57:07 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-10-04 03:57:07 (GMT) |
| commit | abcea22c5ba45d00c713d25a77773efbf6d941f7 (patch) | |
| tree | 9cd98ebad82fc8ef80ff53c47da10f80ec114ffe /src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | |
| parent | 33b76a659b2f44fa7038e375bbfb4cfd449ae617 (diff) | |
| parent | e2c45cbacaa0f48e1397572d3e5baa847c86e9b1 (diff) | |
| download | Qt-abcea22c5ba45d00c713d25a77773efbf6d941f7.zip Qt-abcea22c5ba45d00c713d25a77773efbf6d941f7.tar.gz Qt-abcea22c5ba45d00c713d25a77773efbf6d941f7.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.7-from-4.6
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.cpp
Diffstat (limited to 'src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp index 9e8b1bf..4ff6a21 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp @@ -196,8 +196,9 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const break; } } + if (!match) + failed = true; } - if (!match) failed = true; // check frequency match = false; @@ -208,6 +209,8 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const break; } } + if (!match) + failed = true; } // check sample size @@ -219,6 +222,8 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const break; } } + if (!match) + failed = true; } // check byte order @@ -230,6 +235,8 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const break; } } + if (!match) + failed = true; } // check sample type @@ -241,6 +248,8 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const break; } } + if (!match) + failed = true; } if(!failed) { |