diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2012-01-16 16:40:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-20 06:30:37 +0100 |
| commit | 8ff5b88b27b83438bfe576eea824a4a4d47249ce (patch) | |
| tree | 1ccb1b0114ec8371ac44a0ab68535c50f8e4e604 /src/multimedia/qmediaobject.cpp | |
| parent | 382ba7d4f4c1ca91d59d04faf35a3d75d6430df5 (diff) | |
Changed metadata keys type from enum to QString.
This allows to combine metaData and extendedMetaData
and simplify metadata handling on both backend and application sides.
Change-Id: I136eedc86c215be3485db101c43069ca7c82101b
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/multimedia/qmediaobject.cpp')
| -rw-r--r-- | src/multimedia/qmediaobject.cpp | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index 152197507..3901587e9 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -322,7 +322,7 @@ bool QMediaObject::isMetaDataAvailable() const /*! Returns the value associated with a meta-data \a key. */ -QVariant QMediaObject::metaData(QtMultimedia::MetaData key) const +QVariant QMediaObject::metaData(const QString &key) const { Q_D(const QMediaObject); @@ -334,13 +334,13 @@ QVariant QMediaObject::metaData(QtMultimedia::MetaData key) const /*! Returns a list of keys there is meta-data available for. */ -QList<QtMultimedia::MetaData> QMediaObject::availableMetaData() const +QStringList QMediaObject::availableMetaData() const { Q_D(const QMediaObject); return d->metaDataControl ? d->metaDataControl->availableMetaData() - : QList<QtMultimedia::MetaData>(); + : QStringList(); } /*! @@ -349,34 +349,6 @@ QList<QtMultimedia::MetaData> QMediaObject::availableMetaData() const Signals that this media object's meta-data has changed. */ -/*! - Returns the value associated with a meta-data \a key. - - The naming and type of extended meta-data is not standardized, so the values and meaning - of keys may vary between backends. -*/ -QVariant QMediaObject::extendedMetaData(const QString &key) const -{ - Q_D(const QMediaObject); - - return d->metaDataControl - ? d->metaDataControl->extendedMetaData(key) - : QVariant(); -} - -/*! - Returns a list of keys there is extended meta-data available for. -*/ -QStringList QMediaObject::availableExtendedMetaData() const -{ - Q_D(const QMediaObject); - - return d->metaDataControl - ? d->metaDataControl->availableExtendedMetaData() - : QStringList(); -} - - void QMediaObject::setupMetaData() { Q_D(QMediaObject); |