diff options
| author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2012-03-14 13:02:32 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 23:39:45 +0100 |
| commit | a8ba6e3c7f181e387eb53b122d58c433b5784319 (patch) | |
| tree | 8a090349fa2698f879085380e6daa625ad979bdf /src/plugins/pulseaudio | |
| parent | 61c09d1614c560de9514ac0fd3344bf0280fca33 (diff) | |
Updated plugins to use new plugin architecture
Changed QMediaPluginLoader to use QFactoryLoader instead of QPluginLoader
and used metadata to get keys.
Removed QAudioPluginLoader and changed audio classes to use instead use
QMediaPluginLoader.
The plugins must include the Q_PLUGIN_METADATA macro, and no longer use
the Q_PLUGIN_EXPORT/Q_PLUGIN_EXPORT2 macros.
A json file has been added for each plugin which can contain metadata
which is available to the plugin loader before the plugin is actually
loaded, and is used to read the keys for the plugin, e.g. supported
services.
QFactoryInterface will be deprecated and has been removed from all
plugins.
Change-Id: I035b82f9c9c65717bebf704d560ea8f891df21da
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/plugins/pulseaudio')
| -rw-r--r-- | src/plugins/pulseaudio/pulseaudio.json | 3 | ||||
| -rw-r--r-- | src/plugins/pulseaudio/pulseaudio.pro | 3 | ||||
| -rw-r--r-- | src/plugins/pulseaudio/qpulseaudioplugin.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/pulseaudio/qpulseaudioplugin.h | 3 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/pulseaudio/pulseaudio.json b/src/plugins/pulseaudio/pulseaudio.json new file mode 100644 index 000000000..a31d52107 --- /dev/null +++ b/src/plugins/pulseaudio/pulseaudio.json @@ -0,0 +1,3 @@ +{ + "Keys": ["default"] +} diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro index 0897b8ff7..0a922aa16 100644 --- a/src/plugins/pulseaudio/pulseaudio.pro +++ b/src/plugins/pulseaudio/pulseaudio.pro @@ -26,3 +26,6 @@ SOURCES += qpulseaudioplugin.cpp \ target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} INSTALLS += target + +OTHER_FILES += \ + pulseaudio.json diff --git a/src/plugins/pulseaudio/qpulseaudioplugin.cpp b/src/plugins/pulseaudio/qpulseaudioplugin.cpp index 85490dff8..fab7f7184 100644 --- a/src/plugins/pulseaudio/qpulseaudioplugin.cpp +++ b/src/plugins/pulseaudio/qpulseaudioplugin.cpp @@ -55,11 +55,6 @@ QPulseAudioPlugin::QPulseAudioPlugin(QObject *parent) { } -QStringList QPulseAudioPlugin::keys() const -{ - return QStringList() << "default"; -} - QList<QByteArray> QPulseAudioPlugin::availableDevices(QAudio::Mode mode) const { return m_pulseEngine->availableDevices(mode); @@ -84,6 +79,4 @@ QAbstractAudioDeviceInfo *QPulseAudioPlugin::createDeviceInfo(const QByteArray & return deviceInfo; } -Q_EXPORT_PLUGIN2(qtmedia_pulse, QPulseAudioPlugin); - QT_END_NAMESPACE diff --git a/src/plugins/pulseaudio/qpulseaudioplugin.h b/src/plugins/pulseaudio/qpulseaudioplugin.h index d52596756..1540f7278 100644 --- a/src/plugins/pulseaudio/qpulseaudioplugin.h +++ b/src/plugins/pulseaudio/qpulseaudioplugin.h @@ -52,11 +52,12 @@ class QPulseAudioPlugin : public QAudioSystemPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "com.nokia.qt.QAudioSystemFactoryInterface" FILE "pulseaudio.json") + public: QPulseAudioPlugin(QObject *parent = 0); ~QPulseAudioPlugin() {} - QStringList keys() const; QList<QByteArray> availableDevices(QAudio::Mode mode) const; QAbstractAudioInput *createInput(const QByteArray &device); QAbstractAudioOutput *createOutput(const QByteArray &device); |