[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/phonon-xine
From:       Matthias Kretz <kretz () kde ! org>
Date:       2007-05-18 10:01:52
Message-ID: 1179482512.856657.9976.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 665879 by mkretz:

cleanup and crash fix


 M  +1 -12     bytestream.cpp  


--- trunk/KDE/kdemultimedia/phonon-xine/bytestream.cpp #665878:665879
@@ -49,7 +49,7 @@
 namespace Xine
 {
 ByteStream::ByteStream(const MediaSource &mediaSource, MediaObject* parent)
-    : QObject(parent),
+    : QObject(0), // don't let MediaObject's ~QObject delete us - the input plugin will delete us
     m_mediaObject(parent),
     m_streamSize(0),
     m_currentPosition(0),
@@ -296,17 +296,6 @@
 ByteStream::~ByteStream()
 {
     PXINE_DEBUG << k_funcinfo << endl;
-//X     m_mutex.lock();
-//X     m_seekMutex.lock();
-//X     m_stopped = true;
-//X     // the other thread is now not between m_mutex.lock() and m_waitingForData.wait(&m_mutex), so it
-//X     // won't get stuck in m_waitingForData.wait if it's not there right now
-//X     stream().setMrl(QByteArray());
-//X     m_seekWaitCondition.wakeAll();
-//X     m_seekMutex.unlock();
-//X     m_waitingForData.wakeAll();
-//X     m_mutex.unlock();
-//X     stream().closeBlocking();
 }
 
 QByteArray ByteStream::mrl() const
[prev in list] [next in list] [prev in thread] [next in thread]