[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-04-07 13:15:31
Message-ID: 1207574131.810548.11891.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 794431 by mkretz:

use StreamInterface2

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


--- trunk/KDE/kdebase/runtime/phonon/xine/bytestream.cpp #794430:794431
@@ -88,7 +88,7 @@
 }
 
 ByteStream::ByteStream(const MediaSource &mediaSource, MediaObject *parent)
-    : QObject(0), // don't let MediaObject's ~QObject delete us - the input plugin \
will delete us +    : StreamInterface2(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 #794430:794431
@@ -26,7 +26,7 @@
 #include <xine.h>
 
 #include "xineengine.h"
-#include <phonon/streaminterface.h>
+#include <Phonon/StreamInterface>
 #include <QByteArray>
 #include <QSharedData>
 #include <QQueue>
@@ -43,10 +43,9 @@
 namespace Xine
 {
 class MediaObject;
-class ByteStream : public QObject, public StreamInterface, public QSharedData
+class ByteStream : public StreamInterface2, public QSharedData
 {
     Q_OBJECT
-    Q_INTERFACES(Phonon::StreamInterface)
     public:
         static ByteStream *fromMrl(const QByteArray &mrl);
         ByteStream(const MediaSource &, MediaObject *parent);


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