summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2010-01-14 01:58:01 (GMT)
committerKurt Korbatits <kurt.korbatits@nokia.com>2010-01-14 01:58:01 (GMT)
commite2f1ae626840d3f7c13fb5e071506d545688a9ab (patch)
treefa71b36105607ecd8b40813f7ba3a3b52d823b47 /doc/src
parent6c5454b0f8bc75f32af6ceaa7a5730413e9812f9 (diff)
downloadQt-e2f1ae626840d3f7c13fb5e071506d545688a9ab.zip
Qt-e2f1ae626840d3f7c13fb5e071506d545688a9ab.tar.gz
Qt-e2f1ae626840d3f7c13fb5e071506d545688a9ab.tar.bz2
Revert "Frequency to SampleRate and channels to channelCount."
This reverts commit 80d4a4945d3273a4b2ce91e34597533f661af320. Conflicts: examples/multimedia/audioinput/audioinput.cpp examples/multimedia/audiooutput/audiooutput.cpp src/multimedia/audio/qaudio_mac.cpp src/multimedia/audio/qaudiodeviceinfo_alsa_p.cpp src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.h src/multimedia/audio/qaudioinput.cpp src/multimedia/audio/qaudiooutput.cpp tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp tests/auto/qaudioinput/tst_qaudioinput.cpp tests/auto/qaudiooutput/tst_qaudiooutput.cpp
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/snippets/audio/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index 6b7a6a5..019f208 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.cpp
@@ -89,7 +89,7 @@ private:
{
//![1]
QAudioFormat format;
- format.setSampleRate(44100);
+ format.setFrequency(44100);
//![1]
format.setChannels(2);
format.setSampleSize(16);