[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-04-03 16:27:47
Message-ID: 1207240067.322820.22991.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 793316 by mkretz:
private headers need _p
M +1 -1 Mainpage.dox
M +1 -1 abstractmediastream2_p.h
M +1 -1 abstractmediastream_p.h
M +2 -2 audiooutput.cpp
M +2 -2 audiooutputadaptor.cpp
D audiooutputadaptor.h
A audiooutputadaptor_p.h audiooutputadaptor.h#793310 [License: \
GENERATED FILE] M +1 -1 backendcapabilities.cpp
M +1 -1 experimental/backendcapabilities.cpp
M +2 -2 experimental/globalconfig.cpp
D experimental/globalconfig.h
A experimental/globalconfig_p.h experimental/globalconfig.h#793310 \
[License: LGPL (v2)] M +1 -1 experimental/visualization_p.h
M +2 -2 globalconfig.cpp
D globalconfig.h
A globalconfig_p.h globalconfig.h#793307 [License: LGPL (v2)]
M +22 -2 iodevicestream.cpp
D iodevicestream.h
A iodevicestream_p.h iodevicestream.h#793310 [License: LGPL (v2)]
M +1 -1 kcm/outputdevicechoice.cpp
M +1 -1 medianode.cpp
D medianodedestructionhandler.h
A medianodedestructionhandler_p.h medianodedestructionhandler.h#793310 \
[License: LGPL (v2)] M +1 -1 mediaobject_p.h
M +1 -1 mediasource.cpp
M +1 -1 path_p.h
--- trunk/KDE/kdelibs/phonon/Mainpage.dox #793315:793316
@@ -158,7 +158,7 @@
// DOXYGEN_SET_HIDE_SCOPE_NAMES = YES
// DOXYGEN_SET_HIDE_FRIEND_COMPOUNDS = YES
// DOXYGEN_SET_PROJECT_NAME = Phonon
-// DOXYGEN_EXCLUDE += examples kcm DESIGN experimental factory_p.h globalconfig.h \
basedestructionhandler.h audiooutputadaptor.h iodevicestream.h kdepluginfactory.h \
kiomediastream.h pluginfactory.h *.cpp libkaudiodevicelist *interface.h backend +// \
DOXYGEN_EXCLUDE += examples kcm DESIGN experimental factory_p.h globalconfig_p.h \
basedestructionhandler.h audiooutputadaptor.h iodevicestream_p.h kdepluginfactory.h \
kiomediastream.h pluginfactory.h *.cpp libkaudiodevicelist *interface.h backend // \
DOXYGEN_SET_EXAMPLE_PATH += @topdir@/phonon/examples // DOXYGEN_SET_EXTRACT_ALL = NO
// DOXYGEN_SET_HIDE_UNDOC_MEMBERS = YES
--- trunk/KDE/kdelibs/phonon/abstractmediastream2_p.h #793315:793316
@@ -25,7 +25,7 @@
#include "abstractmediastream_p.h"
#include "mediaobject_p.h"
-#include "medianodedestructionhandler.h"
+#include "medianodedestructionhandler_p.h"
#include "streameventqueue_p.h"
QT_BEGIN_NAMESPACE
--- trunk/KDE/kdelibs/phonon/abstractmediastream_p.h #793315:793316
@@ -25,7 +25,7 @@
#include "mediaobject_p.h"
#include "streaminterface.h"
-#include "medianodedestructionhandler.h"
+#include "medianodedestructionhandler_p.h"
QT_BEGIN_NAMESPACE
--- trunk/KDE/kdelibs/phonon/audiooutput.cpp #793315:793316
@@ -20,8 +20,8 @@
#include "audiooutput_p.h"
#include "factory_p.h"
#include "objectdescription.h"
-#include "audiooutputadaptor.h"
-#include "globalconfig.h"
+#include "audiooutputadaptor_p.h"
+#include "globalconfig_p.h"
#include "audiooutputinterface.h"
#include "phononnamespace_p.h"
#include "platform_p.h"
--- trunk/KDE/kdelibs/phonon/audiooutputadaptor.cpp #793315:793316
@@ -7,7 +7,7 @@
* This is an auto-generated file.
*/
-#include "audiooutputadaptor.h"
+#include "audiooutputadaptor_p.h"
#include "audiooutput.h"
#include <QtCore/QArgument>
#include <QtCore/QByteRef>
@@ -73,5 +73,5 @@
return name;
}
-#include "moc_audiooutputadaptor.cpp"
+#include "moc_audiooutputadaptor_p.cpp"
--- trunk/KDE/kdelibs/phonon/backendcapabilities.cpp #793315:793316
@@ -23,7 +23,7 @@
#include "phonondefs_p.h"
#include "backendinterface.h"
#include "factory_p.h"
-#include "globalconfig.h"
+#include "globalconfig_p.h"
#include "globalstatic_p.h"
#include "objectdescription.h"
--- trunk/KDE/kdelibs/phonon/experimental/backendcapabilities.cpp #793315:793316
@@ -18,7 +18,7 @@
*/
#include "backendcapabilities.h"
-#include "globalconfig.h"
+#include "globalconfig_p.h"
namespace Phonon
{
--- trunk/KDE/kdelibs/phonon/experimental/globalconfig.cpp #793315:793316
@@ -17,7 +17,7 @@
*/
-#include "globalconfig.h"
+#include "globalconfig_p.h"
#include "../factory_p.h"
#include "objectdescription.h"
@@ -115,4 +115,4 @@
} // namespace Experimental
} // namespace Phonon
-#include "moc_globalconfig.cpp"
+#include "moc_globalconfig_p.cpp"
--- trunk/KDE/kdelibs/phonon/experimental/visualization_p.h #793315:793316
@@ -22,7 +22,7 @@
#include "visualization.h"
#include "../medianode_p.h"
-#include "../medianodedestructionhandler.h"
+#include "../medianodedestructionhandler_p.h"
#include "../phonondefs_p.h"
namespace Phonon
--- trunk/KDE/kdelibs/phonon/globalconfig.cpp #793315:793316
@@ -17,7 +17,7 @@
*/
-#include "globalconfig.h"
+#include "globalconfig_p.h"
#include "factory_p.h"
#include "objectdescription.h"
@@ -155,6 +155,6 @@
QT_END_NAMESPACE
-#include "moc_globalconfig.cpp"
+#include "moc_globalconfig_p.cpp"
// vim: sw=4 ts=4
--- trunk/KDE/kdelibs/phonon/iodevicestream.cpp #793315:793316
@@ -17,14 +17,34 @@
*/
-#include "iodevicestream.h"
#include "iodevicestream_p.h"
+#include "abstractmediastream2_p.h"
QT_BEGIN_NAMESPACE
namespace Phonon
{
+class IODeviceStreamPrivate : public AbstractMediaStream2Private
+{
+ Q_DECLARE_PUBLIC(IODeviceStream)
+ protected:
+ IODeviceStreamPrivate(QIODevice *_ioDevice)
+ : ioDevice(_ioDevice)
+ {
+ if (!ioDevice->isOpen()) {
+ ioDevice->open(QIODevice::ReadOnly);
+ }
+ Q_ASSERT(ioDevice->isOpen());
+ Q_ASSERT(ioDevice->isReadable());
+ streamSize = ioDevice->size();
+ streamSeekable = !ioDevice->isSequential();
+ }
+
+ private:
+ QIODevice *ioDevice;
+};
+
IODeviceStream::IODeviceStream(QIODevice *ioDevice, QObject *parent)
: AbstractMediaStream2(*new IODeviceStreamPrivate(ioDevice), parent)
{
@@ -67,6 +87,6 @@
QT_END_NAMESPACE
-#include "moc_iodevicestream.cpp"
+#include "moc_iodevicestream_p.cpp"
// vim: sw=4 sts=4 et tw=100
--- trunk/KDE/kdelibs/phonon/kcm/outputdevicechoice.cpp #793315:793316
@@ -34,7 +34,7 @@
#include "../libkaudiodevicelist/audiodeviceenumerator.h"
#include "../libkaudiodevicelist/audiodevice.h"
#include "../qsettingsgroup_p.h"
-#include "../globalconfig.h"
+#include "../globalconfig_p.h"
#include <kfadewidgeteffect.h>
#include <kdialog.h>
--- trunk/KDE/kdelibs/phonon/medianode.cpp #793315:793316
@@ -20,7 +20,7 @@
#include "medianode.h"
#include "medianode_p.h"
-#include "medianodedestructionhandler.h"
+#include "medianodedestructionhandler_p.h"
#include "factory_p.h"
QT_BEGIN_NAMESPACE
--- trunk/KDE/kdelibs/phonon/mediaobject_p.h #793315:793316
@@ -23,7 +23,7 @@
#include "mediaobject.h"
#include "medianode_p.h"
#include <QtCore/QString>
-#include "medianodedestructionhandler.h"
+#include "medianodedestructionhandler_p.h"
#include "mediasource.h"
#include <QtCore/QQueue>
--- trunk/KDE/kdelibs/phonon/mediasource.cpp #793315:793316
@@ -19,7 +19,7 @@
#include "mediasource.h"
#include "mediasource_p.h"
-#include "iodevicestream.h"
+#include "iodevicestream_p.h"
#include "abstractmediastream2_p.h"
#include <QtCore/QFileInfo>
--- trunk/KDE/kdelibs/phonon/path_p.h #793315:793316
@@ -25,7 +25,7 @@
#include <QtCore/QList>
#include <QtCore/QSharedData>
#include "effect.h"
-#include "medianodedestructionhandler.h"
+#include "medianodedestructionhandler_p.h"
QT_BEGIN_NAMESPACE
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic