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

List:       kde-commits
Subject:    KDE/kdebase/runtime/phonon/xine
From:       Thiago Macieira <thiago () kde ! org>
Date:       2007-12-10 11:42:36
Message-ID: 1197286956.692160.30239.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 746830 by thiago:

Compile with Qt 4.4 - that's what you get for using undocumented classes...


 M  +1 -1      audioport.cpp  
 M  +2 -2      backend.cpp  
 M  +1 -1      bytestreamplugin.cpp  
 M  +1 -1      xinethread.cpp  


--- trunk/KDE/kdebase/runtime/phonon/xine/audioport.cpp #746829:746830
@@ -171,7 +171,7 @@
 {
     if (d->ref == 1 && !d->dontDelete) {
         // this is the last ref to the data, so it will get deleted in a few \
                instructions unless
-        new AudioPortDeleter(d);
+        new AudioPortDeleter(d.data());
         // AudioPortDeleter refs it once more
     }
 }
--- trunk/KDE/kdebase/runtime/phonon/xine/backend.cpp #746829:746830
@@ -460,7 +460,7 @@
         SourceNode *source = qobject_cast<SourceNode *>(q);
         if (source) {
             //keep->addObject(source->threadSafeObject());
-            allXtObjects.append(QExplicitlySharedDataPointer<SharedData>(static_cast<SharedData \
*>(source->threadSafeObject()))); +            \
allXtObjects.append(QExplicitlySharedDataPointer<SharedData>(source->threadSafeObject().data()));
  foreach (SinkNode *sink, source->sinks()) {
                 WireCall w(source, sink);
                 if (wireCallsUnordered.contains(w)) {
@@ -474,7 +474,7 @@
         SinkNode *sink = qobject_cast<SinkNode *>(q);
         if (sink) {
             keep->addObject(sink->threadSafeObject());
-            allXtObjects.append(QExplicitlySharedDataPointer<SharedData>(static_cast<SharedData \
*>(sink->threadSafeObject()))); +            \
allXtObjects.append(QExplicitlySharedDataPointer<SharedData>(sink->threadSafeObject().data()));
  if (sink->source()) {
                 WireCall w(sink->source(), sink);
                 if (wireCallsUnordered.contains(w)) {
--- trunk/KDE/kdebase/runtime/phonon/xine/bytestreamplugin.cpp #746829:746830
@@ -51,7 +51,7 @@
 
     inline xine_stream_t *stream() { return m_stream; }
 
-    inline Phonon::Xine::ByteStream *bytestream() { return m_bytestream; }
+    inline Phonon::Xine::ByteStream *bytestream() { return m_bytestream.data(); }
 
 private:
     xine_stream_t *m_stream;
--- trunk/KDE/kdebase/runtime/phonon/xine/xinethread.cpp #746829:746830
@@ -96,7 +96,7 @@
                 kDebug(610) << "     " << wire.source << " -> " << wire.sink;
                 wire.sink->assert();
                 wire.source->assert();
-                wire.sink->rewireTo(wire.source);
+                wire.sink->rewireTo(wire.source.data());
             }
         }
         return true;


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