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/qt7 | |
| 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/qt7')
| -rw-r--r-- | src/plugins/qt7/qt7.json | 3 | ||||
| -rw-r--r-- | src/plugins/qt7/qt7.pro | 3 | ||||
| -rw-r--r-- | src/plugins/qt7/qt7serviceplugin.h | 4 | ||||
| -rw-r--r-- | src/plugins/qt7/qt7serviceplugin.mm | 11 |
4 files changed, 9 insertions, 12 deletions
diff --git a/src/plugins/qt7/qt7.json b/src/plugins/qt7/qt7.json new file mode 100644 index 000000000..6758633a6 --- /dev/null +++ b/src/plugins/qt7/qt7.json @@ -0,0 +1,3 @@ +{ + "Keys": ["com.nokia.qt.mediaplayer"] +} diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index 9fe15b07d..83b8c13bb 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -72,3 +72,6 @@ include(mediaplayer/mediaplayer.pri) target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} INSTALLS += target + +OTHER_FILES += \ + qt7.json diff --git a/src/plugins/qt7/qt7serviceplugin.h b/src/plugins/qt7/qt7serviceplugin.h index 2f1fd9021..ef8bed151 100644 --- a/src/plugins/qt7/qt7serviceplugin.h +++ b/src/plugins/qt7/qt7serviceplugin.h @@ -52,11 +52,13 @@ class QT7ServicePlugin , public QMediaServiceSupportedFormatsInterface , public QMediaServiceFeaturesInterface { + Q_OBJECT Q_INTERFACES(QMediaServiceFeaturesInterface) + Q_PLUGIN_METADATA(IID "com.nokia.Qt.QMediaServiceProviderFactoryInterface/1.0" FILE "qt7.json") + public: QT7ServicePlugin(); - QStringList keys() const; QMediaService* create(QString const& key); void release(QMediaService *service); diff --git a/src/plugins/qt7/qt7serviceplugin.mm b/src/plugins/qt7/qt7serviceplugin.mm index 0cc0a584d..a1bbc79a8 100644 --- a/src/plugins/qt7/qt7serviceplugin.mm +++ b/src/plugins/qt7/qt7serviceplugin.mm @@ -59,15 +59,6 @@ QT7ServicePlugin::QT7ServicePlugin() buildSupportedTypes(); } -QStringList QT7ServicePlugin::keys() const -{ - return QStringList() -#ifdef QMEDIA_QT7_PLAYER - << QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER) -#endif - ; -} - QMediaService* QT7ServicePlugin::create(QString const& key) { #ifdef QT_DEBUG_QT7 @@ -124,6 +115,4 @@ void QT7ServicePlugin::buildSupportedTypes() } } -Q_EXPORT_PLUGIN2(qtmedia_qt7engine, QT7ServicePlugin); - QT_END_NAMESPACE |