diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 16:29:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 16:29:53 (GMT) |
| commit | b4334982c1cb6058f02a6633cdf3cacc334d8e51 (patch) | |
| tree | 26a803837b7631de83a77f3490de66b9ed02db26 /examples/multimedia | |
| parent | 02c83c2adf0513041d9a3866d4e589ad79d61bda (diff) | |
| parent | f5bab2bc74ed03fd1db99cba3830b6b21795a627 (diff) | |
| download | Qt-b4334982c1cb6058f02a6633cdf3cacc334d8e51.zip Qt-b4334982c1cb6058f02a6633cdf3cacc334d8e51.tar.gz Qt-b4334982c1cb6058f02a6633cdf3cacc334d8e51.tar.bz2 | |
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 5699175f55acbdfa4ac95ab6c727ebd4a201f3a2
Fixed device context leak in QGLWidget on Windows.
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a13977ce2aba31808a046cddc082a84dc316d78b )
Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 508b02a252b524d34f3ed970eef3bdb6350a2b77
Re-enable data structure packing in Harfbuzz for RVCT
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 85a48bdb52a81a9d18477a347fba5f6c930af416 )
Fixed memory lean in QImageVideoBuffer and QMemoryVideoBuffer.
QLocalSocket/Win: handle ERROR_MORE_DATA after read operation
Fix possible crash in QTextLayout for glyphless items
Attempt to stabilize tst_qtimeline::value
Attempt to stabilize tst_lconvert
Replace custom WAIT_FOR_CONDITION with semi-standard QTRY_COMPARE
Attempt to stabilize tst_qwidget::taskQTBUG_4055_sendSyntheticEnterLeave
Attempt to stabilize tst_qwidget::syntheticEnterLeave
Attempt to stabilize tst_qwidgetaction::visibilityUpdate
Attempt to stabilize tst_lupdate::good
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( aa3f786bdba4dc153620ae7f98e4b0e41770d1d1 )
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 'examples/multimedia')
| -rw-r--r-- | examples/multimedia/audioinput/audioinput.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index 4a408a0..4e5f2a3 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -315,6 +315,11 @@ void InputTest::readMore() void InputTest::toggleMode() { // Change bewteen pull and push modes + if (m_input != 0) { + disconnect(m_input, 0, this, 0); + m_input = 0; + } + m_audioInput->stop(); if (m_pullMode) { |