diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-11 07:55:00 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-03-11 07:55:00 (GMT) |
| commit | b375d1c9f0aa9441827b4340dca5edc2ff6cb43d (patch) | |
| tree | 2cc905ccf26c2f8366935b9480e6819a62173662 | |
| parent | 870c2d0012f95d1bd43b725104c042e3231d5012 (diff) | |
| parent | ab3f818d2b2b597e8d45939a559a0ea7e1bfb481 (diff) | |
| download | Qt-b375d1c9f0aa9441827b4340dca5edc2ff6cb43d.zip Qt-b375d1c9f0aa9441827b4340dca5edc2ff6cb43d.tar.gz Qt-b375d1c9f0aa9441827b4340dca5edc2ff6cb43d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
| -rw-r--r-- | doc/src/platforms/supported-platforms.qdoc | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudioinput_alsa_p.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc index a84ad56..578ec37 100644 --- a/doc/src/platforms/supported-platforms.qdoc +++ b/doc/src/platforms/supported-platforms.qdoc @@ -116,7 +116,7 @@ \o aCC 3.57, gcc 3.4 \row \o HPUXi 11.23 \o aCC 6.10 - \row \o Solaris 10 UltraSparc + \row \o Solaris 10 (UltraSparc, x86) \o Sun Studio 12 \row \o AIX 6 \o Power5 xlC 7 diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp index 6010f3c..5eb23d0 100644 --- a/src/multimedia/audio/qaudioinput_alsa_p.cpp +++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp @@ -588,7 +588,11 @@ int QAudioInputPrivate::notifyInterval() const qint64 QAudioInputPrivate::processedUSecs() const { - return qint64(1000000) * totalTimeValue / settings.frequency(); + qint64 result = qint64(1000000) * totalTimeValue / + (settings.channels()*(settings.sampleSize()/8)) / + settings.frequency(); + + return result; } void QAudioInputPrivate::suspend() |