[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-03-28 17:25:30
Message-ID: 1206725130.547502.6791.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 791192 by mkretz:
Factory is an internal class, so the header needs to be called factory_p.h instead
M +1 -1 Mainpage.dox
M +1 -1 abstractaudiooutput.cpp
M +1 -1 audiooutput.cpp
M +1 -1 backendcapabilities.cpp
M +1 -1 backendcapabilities_p.h
M +1 -1 effect.cpp
M +0 -1 experimental/CMakeLists.txt
M +1 -1 experimental/audiodataoutput.cpp
M +1 -1 experimental/avcapture.cpp
M +2 -2 experimental/factory.cpp
D experimental/factory.h
A experimental/factory_p.h experimental/factory.h#791185 [License: \
LGPL (v2/3)] M +1 -1 experimental/globalconfig.cpp
M +1 -1 experimental/videodataoutput.cpp
M +1 -1 experimental/visualization.cpp
M +35 -2 factory.cpp
D factory.h
A factory_p.h factory.h#791185 [License: LGPL (v2)]
M +1 -1 globalconfig.cpp
M +1 -1 medianode.cpp
M +1 -1 mediaobject.cpp
M +1 -1 objectdescription.cpp
M +1 -1 objectdescriptionmodel.cpp
M +1 -1 path.cpp
M +1 -1 phononnamespace.cpp
M +1 -1 platform.cpp
M +1 -1 seekslider_p.h
M +1 -1 tests/backendcapabilitiestest.cpp
M +1 -1 tests/loadfakebackend.h
M +1 -1 tests/methodtest.cpp
M +1 -1 videowidget.cpp
M +1 -1 volumefadereffect.cpp
M +1 -1 volumeslider.cpp
M +1 -1 volumeslider_p.h
--- trunk/KDE/kdelibs/phonon/Mainpage.dox #791191:791192
@@ -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.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.h \
basedestructionhandler.h audiooutputadaptor.h iodevicestream.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/abstractaudiooutput.cpp #791191:791192
@@ -18,7 +18,7 @@
*/
#include "abstractaudiooutput.h"
#include "abstractaudiooutput_p.h"
-#include "factory.h"
+#include "factory_p.h"
#define PHONON_CLASSNAME AbstractAudioOutput
--- trunk/KDE/kdelibs/phonon/audiooutput.cpp #791191:791192
@@ -18,7 +18,7 @@
*/
#include "audiooutput.h"
#include "audiooutput_p.h"
-#include "factory.h"
+#include "factory_p.h"
#include "objectdescription.h"
#include "audiooutputadaptor.h"
#include "globalconfig.h"
--- trunk/KDE/kdelibs/phonon/backendcapabilities.cpp #791191:791192
@@ -22,7 +22,7 @@
#include "phonondefs_p.h"
#include "backendinterface.h"
-#include "factory.h"
+#include "factory_p.h"
#include "globalconfig.h"
#include "globalstatic_p.h"
#include "objectdescription.h"
--- trunk/KDE/kdelibs/phonon/backendcapabilities_p.h #791191:791192
@@ -22,7 +22,7 @@
#include "backendcapabilities.h"
#include <QtCore/QObject>
-#include "factory.h"
+#include "factory_p.h"
QT_BEGIN_NAMESPACE
--- trunk/KDE/kdelibs/phonon/effect.cpp #791191:791192
@@ -20,7 +20,7 @@
#include "effect_p.h"
#include "effectparameter.h"
#include "effectinterface.h"
-#include "factory.h"
+#include "factory_p.h"
#define PHONON_INTERFACENAME EffectInterface
--- trunk/KDE/kdelibs/phonon/experimental/CMakeLists.txt #791191:791192
@@ -29,6 +29,5 @@
mediasource.h
backendcapabilities.h
backendinterface.h
- factory.h
objectdescription.h
DESTINATION ${INCLUDE_INSTALL_DIR}/phonon/experimental COMPONENT Devel)
--- trunk/KDE/kdelibs/phonon/experimental/audiodataoutput.cpp #791191:791192
@@ -18,7 +18,7 @@
*/
#include "audiodataoutput.h"
#include "audiodataoutput_p.h"
-#include "../factory.h"
+#include "../factory_p.h"
#define PHONON_CLASSNAME AudioDataOutput
--- trunk/KDE/kdelibs/phonon/experimental/avcapture.cpp #791191:791192
@@ -18,7 +18,7 @@
*/
#include "avcapture.h"
#include "avcapture_p.h"
-#include "factory.h"
+#include "factory_p.h"
#include "objectdescription.h"
#define PHONON_CLASSNAME AvCapture
--- trunk/KDE/kdelibs/phonon/experimental/factory.cpp #791191:791192
@@ -18,9 +18,9 @@
*/
-#include "factory.h"
+#include "factory_p.h"
#include "objectdescription.h"
-#include "../factory.h"
+#include "../factory_p.h"
#include "../globalstatic_p.h"
#include "../backendinterface.h"
#include "backendinterface.h"
--- trunk/KDE/kdelibs/phonon/experimental/globalconfig.cpp #791191:791192
@@ -19,7 +19,7 @@
#include "globalconfig.h"
-#include "../factory.h"
+#include "../factory_p.h"
#include "objectdescription.h"
#include "../phonondefs_p.h"
#include "../backendinterface.h"
--- trunk/KDE/kdelibs/phonon/experimental/videodataoutput.cpp #791191:791192
@@ -18,7 +18,7 @@
*/
#include "videodataoutput.h"
#include "videodataoutput_p.h"
-#include "../factory.h"
+#include "../factory_p.h"
#include <QtCore/QSize>
#define PHONON_CLASSNAME VideoDataOutput
--- trunk/KDE/kdelibs/phonon/experimental/visualization.cpp #791191:791192
@@ -21,7 +21,7 @@
#include "visualization_p.h"
#include "../objectdescription.h"
#include "../path.h"
-#include "../factory.h"
+#include "../factory_p.h"
#define PHONON_CLASSNAME Visualization
--- trunk/KDE/kdelibs/phonon/factory.cpp #791191:791192
@@ -17,7 +17,6 @@
*/
-#include "factory.h"
#include "factory_p.h"
#include "backendinterface.h"
@@ -25,6 +24,7 @@
#include "audiooutput.h"
#include "audiooutput_p.h"
#include "globalstatic_p.h"
+#include "objectdescription.h"
#include "platformplugin.h"
#include "phononnamespace_p.h"
@@ -34,6 +34,7 @@
#include <QtCore/QLibrary>
#include <QtCore/QList>
#include <QtCore/QPluginLoader>
+#include <QtCore/QPointer>
#include <QtGui/QIcon>
#ifndef QT_NO_DBUS
#include <QtDBus/QtDBus>
@@ -44,6 +45,38 @@
namespace Phonon
{
+class PlatformPlugin;
+class FactoryPrivate : public Phonon::Factory::Sender
+{
+ friend QObject *Factory::backend(bool);
+ Q_OBJECT
+ public:
+ FactoryPrivate();
+ ~FactoryPrivate();
+ bool createBackend();
+ PlatformPlugin *platformPlugin();
+
+ QPointer<QObject> m_backendObject;
+ PlatformPlugin *m_platformPlugin;
+ bool m_noPlatformPlugin;
+
+ QList<QObject *> objects;
+ QList<MediaNodePrivate *> mediaNodePrivateList;
+
+ private Q_SLOTS:
+ /**
+ * This is called via DBUS when the user changes the Phonon Backend.
+ */
+ void phononBackendChanged();
+
+ /**
+ * unregisters the backend object
+ */
+ void objectDestroyed(QObject *);
+
+ void objectDescriptionChanged(ObjectDescriptionType);
+};
+
PHONON_GLOBAL_STATIC(Phonon::FactoryPrivate, globalFactory)
void Factory::setBackend(QObject *b)
@@ -349,7 +382,7 @@
QT_END_NAMESPACE
-#include "moc_factory.cpp"
+#include "factory.moc"
#include "moc_factory_p.cpp"
// vim: sw=4 ts=4
--- trunk/KDE/kdelibs/phonon/globalconfig.cpp #791191:791192
@@ -19,7 +19,7 @@
#include "globalconfig.h"
-#include "factory.h"
+#include "factory_p.h"
#include "objectdescription.h"
#include "phonondefs_p.h"
#include "backendinterface.h"
--- trunk/KDE/kdelibs/phonon/medianode.cpp #791191:791192
@@ -21,7 +21,7 @@
#include "medianode.h"
#include "medianode_p.h"
#include "medianodedestructionhandler.h"
-#include "factory.h"
+#include "factory_p.h"
QT_BEGIN_NAMESPACE
--- trunk/KDE/kdelibs/phonon/mediaobject.cpp #791191:791192
@@ -19,7 +19,7 @@
#include "mediaobject.h"
#include "mediaobject_p.h"
-#include "factory.h"
+#include "factory_p.h"
#include "mediaobjectinterface.h"
#include "frontendinterface_p.h"
#include "mediasource.h"
--- trunk/KDE/kdelibs/phonon/objectdescription.cpp #791191:791192
@@ -22,7 +22,7 @@
#include <QtCore/QObject>
#include <QtCore/QSet>
-#include "factory.h"
+#include "factory_p.h"
#include <QtCore/QStringList>
#include "backendinterface.h"
--- trunk/KDE/kdelibs/phonon/objectdescriptionmodel.cpp #791191:791192
@@ -27,7 +27,7 @@
#include <QtCore/QMimeData>
#include <QtCore/QStringList>
#include <QtGui/QIcon>
-#include "factory.h"
+#include "factory_p.h"
#if Q_MOC_OUTPUT_REVISION != 59
#ifdef __GNUC__
--- trunk/KDE/kdelibs/phonon/path.cpp #791191:791192
@@ -21,7 +21,7 @@
#include "path_p.h"
#include "backendinterface.h"
-#include "factory.h"
+#include "factory_p.h"
#include "medianode.h"
#include "medianode_p.h"
--- trunk/KDE/kdelibs/phonon/phononnamespace.cpp #791191:791192
@@ -21,7 +21,7 @@
#include "phononnamespace_p.h"
#include "phonondefs_p.h"
-#include "factory.h"
+#include "factory_p.h"
#include "globalstatic_p.h"
#include <QtCore/QCoreApplication>
--- trunk/KDE/kdelibs/phonon/platform.cpp #791191:791192
@@ -19,7 +19,7 @@
#include "platform_p.h"
#include "platformplugin.h"
-#include "factory.h"
+#include "factory_p.h"
#include <QtCore/QCoreApplication>
#include <QtGui/QIcon>
--- trunk/KDE/kdelibs/phonon/seekslider_p.h #791191:791192
@@ -27,7 +27,7 @@
#include <QtGui/QPixmap>
#include <QtGui/QIcon>
#include <QtGui/QStyle>
-#include "factory.h"
+#include "factory_p.h"
#include <QtCore/QPointer>
#include "platform_p.h"
--- trunk/KDE/kdelibs/phonon/tests/backendcapabilitiestest.cpp #791191:791192
@@ -28,7 +28,7 @@
#include <kservicetypetrader.h>
#include "../backendcapabilities.h"
-#include "../factory.h"
+#include "../factory_p.h"
#include "../objectdescription.h"
#include "../backendinterface.h"
--- trunk/KDE/kdelibs/phonon/tests/loadfakebackend.h #791191:791192
@@ -20,7 +20,7 @@
#ifndef TESTS_LOADFAKEBACKEND_H
#define TESTS_LOADFAKEBACKEND_H
-#include "../factory.h"
+#include "../factory_p.h"
#include <QtCore/QUrl>
#include <QtTest>
#include <stdlib.h>
--- trunk/KDE/kdelibs/phonon/tests/methodtest.cpp #791191:791192
@@ -22,7 +22,7 @@
#include <qtest_kde.h>
-#include "../factory.h"
+#include "../factory_p.h"
#include <phonon/streaminterface.h>
#include <phonon/mediaobjectinterface.h>
#include <phonon/backendinterface.h>
--- trunk/KDE/kdelibs/phonon/videowidget.cpp #791191:791192
@@ -20,7 +20,7 @@
#include "videowidget.h"
#include "videowidget_p.h"
#include "videowidgetinterface.h"
-#include "factory.h"
+#include "factory_p.h"
#include "phonondefs_p.h"
#include "phononnamespace_p.h"
--- trunk/KDE/kdelibs/phonon/volumefadereffect.cpp #791191:791192
@@ -20,7 +20,7 @@
#include "volumefadereffect.h"
#include "volumefadereffect_p.h"
#include "volumefaderinterface.h"
-#include "factory.h"
+#include "factory_p.h"
#include <qmath.h>
--- trunk/KDE/kdelibs/phonon/volumeslider.cpp #791191:791192
@@ -22,7 +22,7 @@
#include "audiooutput.h"
#include "phonondefs_p.h"
#include "phononnamespace_p.h"
-#include "factory.h"
+#include "factory_p.h"
QT_BEGIN_NAMESPACE
--- trunk/KDE/kdelibs/phonon/volumeslider_p.h #791191:791192
@@ -26,7 +26,7 @@
#include <QtGui/QLabel>
#include <QtGui/QPixmap>
#include <QtGui/QToolButton>
-#include "factory.h"
+#include "factory_p.h"
#include "audiooutput.h"
#include <QtGui/QIcon>
#include <QtCore/QPointer>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic