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.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.cpp')
| -rw-r--r-- | src/multimedia/audio/qaudiodeviceinfo.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/multimedia/audio/qaudiodeviceinfo.cpp b/src/multimedia/audio/qaudiodeviceinfo.cpp index 1bddb20..19b4669 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.cpp +++ b/src/multimedia/audio/qaudiodeviceinfo.cpp @@ -100,7 +100,7 @@ public: You can also query each device for the formats it supports. A format in this context is a set consisting of a specific byte - order, channel, codec, sample rate, sample size and sample type. A + order, channel, codec, frequency, sample rate, and sample type. A format is represented by the QAudioFormat class. The values supported by the the device for each of these @@ -271,8 +271,6 @@ QList<int> QAudioDeviceInfo::supportedSampleRates() const \obsolete Use supportedSampleRates() instead. - - Returns a list of supported frequencies. */ QList<int> QAudioDeviceInfo::supportedFrequencies() const @@ -293,8 +291,6 @@ QList<int> QAudioDeviceInfo::supportedChannelCounts() const \obsolete Use supportedChannelCount() instead. - - Returns a list of supported channels. */ QList<int> QAudioDeviceInfo::supportedChannels() const |