summaryrefslogtreecommitdiffstats
path: root/examples/multimedia/audiooutput/audiooutput.cpp
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-01-11 13:27:51 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-01-11 13:27:51 (GMT)
commit7f83a227ddfb22a373065c68e903b49ca590cef6 (patch)
tree7063a643d519d91c5e52d4adfa43579e787c3ca5 /examples/multimedia/audiooutput/audiooutput.cpp
parentbbac0f08d65b54eccadae7629a5eef10da3b3370 (diff)
parent22d30bd6c1e8355cb4520885b0d0fef3526cc4e9 (diff)
downloadQt-7f83a227ddfb22a373065c68e903b49ca590cef6.zip
Qt-7f83a227ddfb22a373065c68e903b49ca590cef6.tar.gz
Qt-7f83a227ddfb22a373065c68e903b49ca590cef6.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'examples/multimedia/audiooutput/audiooutput.cpp')
-rw-r--r--examples/multimedia/audiooutput/audiooutput.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index 0c57f4d..58dbbaf 100644
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -164,8 +164,8 @@ AudioTest::AudioTest()
gen->start();
- settings.setFrequency(SYSTEM_FREQ);
- settings.setChannels(1);
+ settings.setSampleRate(SYSTEM_FREQ);
+ settings.setChannelCount(1);
settings.setSampleSize(16);
settings.setCodec("audio/pcm");
settings.setByteOrder(QAudioFormat::LittleEndian);