[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-05-26 17:19:31
Message-ID: 1211822371.574266.23303.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 812942 by mkretz:

revert back to using the old StreamInterface

 M  +1 -1      bytestream.cpp  
 M  +1 -1      bytestream.h  


--- trunk/KDE/kdebase/runtime/phonon/xine/bytestream.cpp #812941:812942
@@ -88,7 +88,7 @@
 }
 
 ByteStream::ByteStream(const MediaSource &mediaSource, MediaObject *parent)
-    : StreamInterface2(0), // don't let MediaObject's ~QObject delete us - the input \
plugin will delete us +    : 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),
--- trunk/KDE/kdebase/runtime/phonon/xine/bytestream.h #812941:812942
@@ -43,7 +43,7 @@
 namespace Xine
 {
 class MediaObject;
-class ByteStream : public StreamInterface2, public QSharedData
+class ByteStream : public QObject, public StreamInterface, public QSharedData
 {
     Q_OBJECT
     public:


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