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/controls/qmetadatareadercontrol.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/controls/qmetadatareadercontrol.cpp')
| -rw-r--r-- | src/multimedia/controls/qmetadatareadercontrol.cpp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp index 7272974c6..a7389bd10 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.cpp +++ b/src/multimedia/controls/qmetadatareadercontrol.cpp @@ -59,9 +59,8 @@ QT_BEGIN_NAMESPACE If a QMediaService can provide read or write access to the meta-data of its current media it will implement QMetaDataReaderControl. This control provides functions for both retrieving and setting meta-data values. - Meta-data may be addressed by the well defined keys in the - QtMultimedia::MetaData enumeration using the metaData() functions, or by - string keys using the extendedMetaData() functions. + Meta-data may be addressed by the keys defined in the + QtMultimedia::MetaData namespace. The functionality provided by this control is exposed to application code by the meta-data members of QMediaObject, and so meta-data access @@ -112,7 +111,7 @@ QMetaDataReaderControl::~QMetaDataReaderControl() */ /*! - \fn QVariant QMetaDataReaderControl::metaData(QtMultimedia::MetaData key) const + \fn QVariant QMetaDataReaderControl::metaData(const QString &key) const Returns the meta-data for the given \a key. */ @@ -124,22 +123,6 @@ QMetaDataReaderControl::~QMetaDataReaderControl() */ /*! - \fn QMetaDataReaderControl::extendedMetaData(const QString &key) const - - Returns the metaData for an abitrary string \a key. - - The valid selection of keys for extended meta-data is determined by the provider and the meaning - and type may differ between providers. -*/ - -/*! - \fn QMetaDataReaderControl::availableExtendedMetaData() const - - Returns a list of keys there is extended meta-data available for. -*/ - - -/*! \fn void QMetaDataReaderControl::metaDataChanged() Signal the changes of meta-data. |