summaryrefslogtreecommitdiffstats
path: root/src/multimedia/audio/qaudioinput_mac_p.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 /src/multimedia/audio/qaudioinput_mac_p.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 'src/multimedia/audio/qaudioinput_mac_p.cpp')
-rw-r--r--src/multimedia/audio/qaudioinput_mac_p.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp
index 7251513..f5be8ee 100644
--- a/src/multimedia/audio/qaudioinput_mac_p.cpp
+++ b/src/multimedia/audio/qaudioinput_mac_p.cpp
@@ -814,7 +814,7 @@ int QAudioInputPrivate::notifyInterval() const
qint64 QAudioInputPrivate::processedUSecs() const
{
- return totalFrames * 1000000 / audioFormat.frequency();
+ return totalFrames * 1000000 / audioFormat.sampleRate();
}
qint64 QAudioInputPrivate::elapsedUSecs() const