diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-28 02:26:30 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-28 02:26:30 (GMT) |
| commit | 566d525f5139955f1af61b21d16644e349b9fc7a (patch) | |
| tree | cc7376b1640726b1817e5f1b9d2b3936282f3914 /src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | |
| parent | d2fa5b80d4f40ac67a7a74552390332551563466 (diff) | |
| parent | c9691c62b62c656a9a153b8879f13a5ce71a6d2d (diff) | |
| download | Qt-566d525f5139955f1af61b21d16644e349b9fc7a.zip Qt-566d525f5139955f1af61b21d16644e349b9fc7a.tar.gz Qt-566d525f5139955f1af61b21d16644e349b9fc7a.tar.bz2 | |
Merge branch 'master' of ../../qt/master
Conflicts:
src/multimedia/audio/qaudiodeviceinfo.cpp
src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
src/multimedia/audio/qaudioformat.cpp
Diffstat (limited to 'src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp index e71e88d..955a880 100644 --- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp @@ -103,6 +103,7 @@ QAudioFormat QAudioDeviceInfoInternal::preferredFormat() const } else { nearest.setFrequency(11025); nearest.setChannelCount(1); + nearest.setByteOrder(QAudioFormat::LittleEndian); nearest.setSampleType(QAudioFormat::SignedInt); nearest.setSampleSize(8); nearest.setCodec(QLatin1String("audio/pcm")); @@ -180,12 +181,12 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const if(!format.codec().startsWith(QLatin1String("audio/pcm"))) failed = true; - if(!failed && !(format.channelCount() == 1 || format.channelCount() == 2)) + if(!failed && !(format.channels() == 1 || format.channels() == 2)) failed = true; if(!failed) { - if(!(format.sampleRate() == 8000 || format.sampleRate() == 11025 || format.sampleRate() == 22050 || - format.sampleRate() == 44100 || format.sampleRate() == 48000 || format.sampleRate() == 96000)) + if(!(format.frequency() == 8000 || format.frequency() == 11025 || format.frequency() == 22050 || + format.frequency() == 44100 || format.frequency() == 48000 || format.frequency() == 96000)) failed = true; } |