summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2010-09-22 23:54:03 (GMT)
committerAndrew den Exter <andrew.den-exter@nokia.com>2010-09-23 00:42:40 (GMT)
commit51de46840d32f714faa4717ae54a1e8559a43eab (patch)
tree273fa920524b36fbc5f3a35c971399f357a04b91 /src/multimedia
parent5b7d75a57e0ec8ee78f843ab0eb6485b8e3b4a22 (diff)
downloadQt-51de46840d32f714faa4717ae54a1e8559a43eab.zip
Qt-51de46840d32f714faa4717ae54a1e8559a43eab.tar.gz
Qt-51de46840d32f714faa4717ae54a1e8559a43eab.tar.bz2
Fix compile failure in QtMultimedia.
QAudioFormat::sampleRate() and QAudioFormat::channelCount() weren't introduced until 4.7. Use frequency() and channels() instead. Reviewed-by: Justin McPherson
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
index 1909009..d3dfa5f 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
@@ -82,9 +82,9 @@ bool QAudioDeviceInfoInternal::isFormatSupported(const QAudioFormat& format) con
return format.isValid()
&& format.codec() == QString::fromLatin1("audio/pcm")
- && self->supportedSampleRates().contains(format.sampleRate())
- && self->supportedChannelCounts().contains(format.channelCount())
- && self->supportedSampleSizes().contains(format.sampleSize());
+ && self->frequencyList().contains(format.frequency())
+ && self->channelsList().contains(format.channels())
+ && self->sampleSizeList().contains(format.sampleSize());
}
QAudioFormat QAudioDeviceInfoInternal::preferredFormat() const