diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-10 07:37:47 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-10 07:37:47 (GMT) |
| commit | 56a50deeb27032bd2125a6950a8044d77513a0fd (patch) | |
| tree | a7539e3d9467df032ab4c5811da3ad9e5b4a784e /src/multimedia/audio/qaudioengine.cpp | |
| parent | 81f3b28f2f82b15f9d255ec38abdc5f749b8809c (diff) | |
| parent | 6da8c83d8b5465cf9b767f288d3ebfa0727085c2 (diff) | |
| download | Qt-56a50deeb27032bd2125a6950a8044d77513a0fd.zip Qt-56a50deeb27032bd2125a6950a8044d77513a0fd.tar.gz Qt-56a50deeb27032bd2125a6950a8044d77513a0fd.tar.bz2 | |
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'src/multimedia/audio/qaudioengine.cpp')
| -rw-r--r-- | src/multimedia/audio/qaudioengine.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/audio/qaudioengine.cpp b/src/multimedia/audio/qaudioengine.cpp index c6e9d97..88e3804 100644 --- a/src/multimedia/audio/qaudioengine.cpp +++ b/src/multimedia/audio/qaudioengine.cpp @@ -189,12 +189,12 @@ QT_BEGIN_NAMESPACE */ /*! - \fn virtual qint64 QAbstractAudioOutput::totalTime() const + \fn virtual qint64 QAbstractAudioOutput::processedUSecs() const Returns the amount of audio data processed since start() was called in milliseconds. */ /*! - \fn virtual qint64 QAbstractAudioOutput::clock() const + \fn virtual qint64 QAbstractAudioOutput::elapsedUSecs() const Returns the milliseconds since start() was called, including time in Idle and suspend states. */ @@ -304,12 +304,12 @@ QT_BEGIN_NAMESPACE */ /*! - \fn virtual qint64 QAbstractAudioInput::totalTime() const + \fn virtual qint64 QAbstractAudioInput::processedUSecs() const Returns the amount of audio data processed since start() was called in milliseconds. */ /*! - \fn virtual qint64 QAbstractAudioInput::clock() const + \fn virtual qint64 QAbstractAudioInput::elapsedUSecs() const Returns the milliseconds since start() was called, including time in Idle and suspend states. */ |