diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 20:14:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 20:14:20 (GMT) |
| commit | 2e7c9082fd472911e61e265eb184f408b8ac62e4 (patch) | |
| tree | 48d30c86d6c126eee077847beea8b02b5f15367d /src/multimedia/audio/qaudiooutput.cpp | |
| parent | db87996d4ca90f8fffb5a8e012fa7f2336c038b0 (diff) | |
| parent | cddc591fc4c6317bca83c081a62b84c15a0644d1 (diff) | |
| download | Qt-2e7c9082fd472911e61e265eb184f408b8ac62e4.zip Qt-2e7c9082fd472911e61e265eb184f408b8ac62e4.tar.gz Qt-2e7c9082fd472911e61e265eb184f408b8ac62e4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
QAudioDeviceInfo::nearestFormat() consistent across all platforms
The documentation for processedUSecs() is ambiguous
Diffstat (limited to 'src/multimedia/audio/qaudiooutput.cpp')
| -rw-r--r-- | src/multimedia/audio/qaudiooutput.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp index 371773c..cf3b79c 100644 --- a/src/multimedia/audio/qaudiooutput.cpp +++ b/src/multimedia/audio/qaudiooutput.cpp @@ -369,8 +369,17 @@ int QAudioOutput::notifyInterval() const } /*! - Returns the amount of audio data processed since start() + Returns the amount of audio data processed by the class since start() was called in microseconds. + + Note: The amount of audio data played can be determined by subtracting + the microseconds of audio data still in the systems audio buffer. + + \code + qint64 bytesInBuffer = bufferSize() - bytesFree(); + qint64 usInBuffer = (qint64)(1000000) * bytesInBuffer / ( channels() * sampleSize() / 8 ) / frequency(); + qint64 usPlayed = processedUSecs() - usInBuffer; + \endcode */ qint64 QAudioOutput::processedUSecs() const |