From 51de46840d32f714faa4717ae54a1e8559a43eab Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Thu, 23 Sep 2010 09:54:03 +1000 Subject: 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 --- src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp index 1909009616..d3dfa5f3a2 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 -- cgit v1.2.1