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

List:       kde-commits
Subject:    KDE/kdelibs/phonon
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-01-31 22:34:41
Message-ID: 1201818881.141805.29188.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 769239 by mkretz:

make it possible to derive from MediaSource (needed for Phonon::Experimental)

 M  +5 -0      mediasource.cpp  
 M  +1 -0      mediasource.h  
 M  +2 -2      mediasource_p.h  


--- trunk/KDE/kdelibs/phonon/mediasource.cpp #769238:769239
@@ -28,6 +28,11 @@
 namespace Phonon
 {
 
+MediaSource::MediaSource(MediaSourcePrivate &dd)
+    : d(&dd)
+{
+}
+
 MediaSource::MediaSource()
     : d(new MediaSourcePrivate(Invalid))
 {
--- trunk/KDE/kdelibs/phonon/mediasource.h #769238:769239
@@ -248,6 +248,7 @@
 
     protected:
         QExplicitlySharedDataPointer<MediaSourcePrivate> d;
+        MediaSource(MediaSourcePrivate &);
 };
 
 } // namespace Phonon
--- trunk/KDE/kdelibs/phonon/mediasource_p.h #769238:769239
@@ -33,7 +33,7 @@
 namespace Phonon
 {
 
-class MediaSourcePrivate : public QSharedData
+class PHONON_EXPORT MediaSourcePrivate : public QSharedData
 {
     public:
         MediaSourcePrivate(MediaSource::Type t)
@@ -43,7 +43,7 @@
         {
         }
 
-        ~MediaSourcePrivate()
+        virtual ~MediaSourcePrivate()
         {
             if (autoDelete) {
                 delete stream;
[prev in list] [next in list] [prev in thread] [next in thread]