summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/phonon/ds9/mediaobject.h
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-08-10 11:45:24 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-08-10 12:45:56 (GMT)
commit65ba2c18a9a3ec82331c0ccab47edc8e252192df (patch)
tree9d4be39ec231f0649ecb0eedb6ec96c07a264499 /src/3rdparty/phonon/ds9/mediaobject.h
parent6826490774d66e0470fc1e5848ab89b3a0d0bb86 (diff)
downloadQt-65ba2c18a9a3ec82331c0ccab47edc8e252192df.zip
Qt-65ba2c18a9a3ec82331c0ccab47edc8e252192df.tar.gz
Qt-65ba2c18a9a3ec82331c0ccab47edc8e252192df.tar.bz2
Fixed an assert that could happen when the mediaSource is deleted
When using streaming, it could happen that the last reference to the MediaSource is in another thread. So the objects are destroyed from another thread. In which case we would delete QObject (ioDevice) in another thread. That is fixed by calling deleteLater which will ensure that they are deleted in their own thread. Note: there was a nother assert that could happen due to a race condition in the worker thread. That is also fixed with this patch. Reviewed-by: jbache
Diffstat (limited to 'src/3rdparty/phonon/ds9/mediaobject.h')
-rw-r--r--src/3rdparty/phonon/ds9/mediaobject.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/ds9/mediaobject.h b/src/3rdparty/phonon/ds9/mediaobject.h
index 2c34ffc..fe52604 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.h
+++ b/src/3rdparty/phonon/ds9/mediaobject.h
@@ -135,7 +135,6 @@ namespace Phonon
};
QList<Filter> decoders; //for the state change requests
};
- Work dequeueWork();
void handleTask();
Graph m_currentRender;