diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 15:11:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 15:11:27 (GMT) |
| commit | efefdf4412707991f28e1a65675dda5b03ab8a7d (patch) | |
| tree | 45632d82a2bd8d783da784c657f99c6ee1cd68b8 /src | |
| parent | 90f2f19795a46f3ba1d46fd62f1cbe31072c2c53 (diff) | |
| parent | 4ca1e4de66aebcaf0a9ed0b57cc7ab4a334757bb (diff) | |
| download | Qt-efefdf4412707991f28e1a65675dda5b03ab8a7d.zip Qt-efefdf4412707991f28e1a65675dda5b03ab8a7d.tar.gz Qt-efefdf4412707991f28e1a65675dda5b03ab8a7d.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:
Audio (osx); In pull mode emit readyRead() for each period received.
AudioInput example; disconnect from the built-in device when changing mode.
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_mac_p.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudioinput_mac_p.cpp b/src/multimedia/audio/qaudioinput_mac_p.cpp index cb65f6e..b99fe11 100644 --- a/src/multimedia/audio/qaudioinput_mac_p.cpp +++ b/src/multimedia/audio/qaudioinput_mac_p.cpp @@ -259,7 +259,7 @@ public: UInt32 inBusNumber, UInt32 inNumberFrames) { - const bool wasEmpty = m_buffer->used() == 0; + const bool pullMode = m_device == 0; OSStatus err; qint64 framesRendered = 0; @@ -330,7 +330,7 @@ public: framesRendered = copied / m_outputFormat.mBytesPerFrame; } - if (wasEmpty && framesRendered > 0) + if (pullMode && framesRendered > 0) emit readyRead(); return framesRendered; |