diff -r 93b982ccede2 -r 5daf16870df6 src/multimedia/audio/qaudiodeviceinfo.cpp --- a/src/multimedia/audio/qaudiodeviceinfo.cpp Mon Jun 21 22:38:13 2010 +0100 +++ b/src/multimedia/audio/qaudiodeviceinfo.cpp Thu Jul 22 16:41:55 2010 +0100 @@ -105,8 +105,8 @@ The values supported by the the device for each of these parameters can be fetched with - supportedByteOrders(), supportedChannels(), supportedCodecs(), - supportedFrequencies(), supportedSampleSizes(), and + supportedByteOrders(), supportedChannelCounts(), supportedCodecs(), + supportedSampleRates(), supportedSampleSizes(), and supportedSampleTypes(). The combinations supported are dependent on the platform, audio plugins installed and the audio device capabilities. If you need a specific format, you can check if the device supports it with isFormatSupported(), or fetch a @@ -259,7 +259,20 @@ } /*! - Returns a list of supported frequencies. + Returns a list of supported sample rates. + + \since 4.7 +*/ + +QList QAudioDeviceInfo::supportedSampleRates() const +{ + return supportedFrequencies(); +} + +/*! + \obsolete + + Use supportedSampleRates() instead. */ QList QAudioDeviceInfo::supportedFrequencies() const @@ -268,7 +281,20 @@ } /*! - Returns a list of supported channels. + Returns a list of supported channel counts. + + \since 4.7 +*/ + +QList QAudioDeviceInfo::supportedChannelCounts() const +{ + return supportedChannels(); +} + +/*! + \obsolete + + Use supportedChannelCount() instead. */ QList QAudioDeviceInfo::supportedChannels() const