diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 20:59:37 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 20:59:37 (GMT) |
| commit | f5a7dcc2fc7a5340e13925bf46ff8aaf4da4b0d3 (patch) | |
| tree | cfef52067762aaf362cd4bc94034edd0290e539b /src/multimedia | |
| parent | 30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff) | |
| parent | 600a19ab7cecc32a3b31c873900303005fb3d672 (diff) | |
| download | Qt-f5a7dcc2fc7a5340e13925bf46ff8aaf4da4b0d3.zip Qt-f5a7dcc2fc7a5340e13925bf46ff8aaf4da4b0d3.tar.gz Qt-f5a7dcc2fc7a5340e13925bf46ff8aaf4da4b0d3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
Diffstat (limited to 'src/multimedia')
| -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; |