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

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon/xine
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-08-11 8:09:02
Message-ID: 1218442142.716582.6739.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 845068 by mkretz:

use MySharedDataPointer here as well to simplify the code

 M  +3 -8      xinestream.cpp  
 M  +2 -1      xinestream.h  


--- trunk/KDE/kdebase/runtime/phonon/xine/xinestream.cpp #845067:845068
@@ -148,7 +148,6 @@
     m_nullAudioPort(0),
     m_nullVideoPort(0),
     m_state(Phonon::LoadingState),
-    m_byteStream(0),
     m_prefinishMarkTimer(0),
     m_errorType(Phonon::NoError),
     m_lastSeekCommand(0),
@@ -1805,18 +1804,14 @@
     if (newMrl != m_mrl) {
         if (m_mrl.startsWith("kbytestream:/")) {
             Q_ASSERT(m_byteStream);
-            Q_ASSERT(ByteStream::fromMrl(m_mrl) == m_byteStream);
-            if (!m_byteStream->ref.deref()) {
-                m_byteStream->deleteLater();
-            }
-            m_byteStream = 0;
+            Q_ASSERT(ByteStream::fromMrl(m_mrl) == m_byteStream.data());
+            m_byteStream.reset();
         }
         m_mrl = newMrl;
         if (m_mrl.startsWith("kbytestream:/")) {
-            Q_ASSERT(m_byteStream == 0);
+            Q_ASSERT(m_byteStream.data() == 0);
             m_byteStream = ByteStream::fromMrl(m_mrl);
             Q_ASSERT(m_byteStream);
-            m_byteStream->ref.ref();
         }
     }
 }
--- trunk/KDE/kdebase/runtime/phonon/xine/xinestream.h #845067:845068
@@ -38,6 +38,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include "xineengine.h"
+#include "myshareddatapointer.h"
 
 class KUrl;
 
@@ -222,7 +223,7 @@
         QWaitCondition m_waitingForRewire;
         QMultiMap<QString, QString> m_metaDataMap;
         QByteArray m_mrl;
-        ByteStream *m_byteStream;
+        MySharedDataPointer<ByteStream> m_byteStream;
         QTimer *m_prefinishMarkTimer;
         struct timeval m_lastTimeUpdate;
 
[prev in list] [next in list] [prev in thread] [next in thread]