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/multimedia/playback | |
| 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/multimedia/playback')
| -rw-r--r-- | src/multimedia/playback/qmediaplaylistioplugin_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/multimedia/playback/qmediaplaylistioplugin_p.h b/src/multimedia/playback/qmediaplaylistioplugin_p.h index 60a12cd4a..5371a9392 100644 --- a/src/multimedia/playback/qmediaplaylistioplugin_p.h +++ b/src/multimedia/playback/qmediaplaylistioplugin_p.h @@ -55,7 +55,6 @@ #include <QtCore/qobject.h> #include <QtCore/qplugin.h> -#include <QtCore/qfactoryinterface.h> #include <qtmultimediadefs.h> @@ -92,7 +91,7 @@ public: virtual void close() = 0; }; -struct Q_MULTIMEDIA_EXPORT QMediaPlaylistIOInterface : public QFactoryInterface +struct Q_MULTIMEDIA_EXPORT QMediaPlaylistIOInterface { virtual bool canRead(QIODevice *device, const QByteArray &format = QByteArray() ) const = 0; virtual bool canRead(const QUrl& location, const QByteArray &format = QByteArray()) const = 0; @@ -111,7 +110,7 @@ Q_DECLARE_INTERFACE(QMediaPlaylistIOInterface, QMediaPlaylistIOInterface_iid); class Q_MULTIMEDIA_EXPORT QMediaPlaylistIOPlugin : public QObject, public QMediaPlaylistIOInterface { Q_OBJECT -Q_INTERFACES(QMediaPlaylistIOInterface:QFactoryInterface) +Q_INTERFACES(QMediaPlaylistIOInterface) public: explicit QMediaPlaylistIOPlugin(QObject *parent = 0); virtual ~QMediaPlaylistIOPlugin(); @@ -121,8 +120,6 @@ public: virtual bool canWrite(QIODevice *device, const QByteArray &format) const = 0; - virtual QStringList keys() const = 0; - virtual QMediaPlaylistReader *createReader(QIODevice *device, const QByteArray &format = QByteArray()) = 0; virtual QMediaPlaylistReader *createReader(const QUrl& location, const QByteArray &format = QByteArray()) = 0; |