summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-01-08 11:50:06 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-01-08 11:50:06 (GMT)
commit2530a32d5e02f2cde0cdf3d6d4e42a0079d669fd (patch)
tree479a98d12ffb6df51965c8355f4f0dae4226c38b /doc/src/snippets
parent3aa77d64608f944592939c5d673f1b7dabec730f (diff)
parent4ba439f78aec1caef268dba0f229b8a0242e4c8d (diff)
downloadQt-2530a32d5e02f2cde0cdf3d6d4e42a0079d669fd.zip
Qt-2530a32d5e02f2cde0cdf3d6d4e42a0079d669fd.tar.gz
Qt-2530a32d5e02f2cde0cdf3d6d4e42a0079d669fd.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'doc/src/snippets')
-rw-r--r--doc/src/snippets/audio/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/audio/main.cpp b/doc/src/snippets/audio/main.cpp
index 0e804ea..f000075 100644
--- a/doc/src/snippets/audio/main.cpp
+++ b/doc/src/snippets/audio/main.cpp
@@ -89,9 +89,9 @@ private:
{
//![1]
QAudioFormat format;
- format.setFrequency(44100);
+ format.setSampleRate(44100);
//![1]
- format.setChannels(2);
+ format.setChannelCount(2);
format.setSampleSize(16);
format.setCodec("audio/pcm");
format.setByteOrder(QAudioFormat::LittleEndian);
@@ -112,7 +112,7 @@ public slots:
switch (newState) {
case QAudio::StopState:
if (output->error() != QAudio::NoError) {
- // Do your error handlin
+ // Perform error handling
} else {
// Normal stop
}