diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-27 03:49:33 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-27 03:49:33 (GMT) |
| commit | dd6262e2c4e977f7a02cd8bdc740a08adb0cad49 (patch) | |
| tree | da20cf9a2031e041254b2325d6af204a0ad3aa9a /src/3rdparty/phonon/waveout | |
| parent | e745245bd86333b0512f50728b80c4610a081a44 (diff) | |
| parent | 7d2bf2c6e3aa23d52ef7305915c6f8db02a5d08f (diff) | |
| download | Qt-dd6262e2c4e977f7a02cd8bdc740a08adb0cad49.zip Qt-dd6262e2c4e977f7a02cd8bdc740a08adb0cad49.tar.gz Qt-dd6262e2c4e977f7a02cd8bdc740a08adb0cad49.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/3rdparty/phonon/waveout')
| -rw-r--r-- | src/3rdparty/phonon/waveout/mediaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/waveout/mediaobject.cpp b/src/3rdparty/phonon/waveout/mediaobject.cpp index 35d9e0b..db71942 100644 --- a/src/3rdparty/phonon/waveout/mediaobject.cpp +++ b/src/3rdparty/phonon/waveout/mediaobject.cpp @@ -247,7 +247,7 @@ namespace Phonon m_stopped(0) { m_thread = new WorkerThread(); - connect(this, SIGNAL(outOfData(QIODevice*, QByteArray*, bool*)), m_thread, SLOT(stream(QIODevice*, QByteArray*, bool*))); + connect(this, SIGNAL(outOfData(QIODevice*,QByteArray*,bool*)), m_thread, SLOT(stream(QIODevice*,QByteArray*,bool*))); m_thread->start(); m_soundBuffer1.waveHeader = new WAVEHDR; m_soundBuffer2.waveHeader = new WAVEHDR; @@ -258,7 +258,7 @@ namespace Phonon MediaObject::~MediaObject() { stop(); - disconnect(this, SIGNAL(outOfData(QIODevice*, QByteArray*, bool*)), m_thread, SLOT(stream(QIODevice*, QByteArray*, bool*))); + disconnect(this, SIGNAL(outOfData(QIODevice*,QByteArray*,bool*)), m_thread, SLOT(stream(QIODevice*,QByteArray*,bool*))); do { //The event loop of m_thread might not be started, yet m_thread->quit(); //If the event loop is not started yet quit() does nothing m_thread->wait(100); |