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 /tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h | |
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 'tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h')
-rw-r--r-- | tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h b/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h index ed758ce6e..8c8ab713c 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockmediastreamscontrol.h @@ -55,9 +55,9 @@ public: StreamType streamType(int index) { return _streams.at(index).type; } void setStreamType(int index, StreamType type) { _streams[index].type = type; } - QVariant metaData(int index, QtMultimedia::MetaData key) { + QVariant metaData(int index, const QString &key) { return _streams.at(index).metaData.value(key); } - void setMetaData(int index, QtMultimedia::MetaData key, const QVariant &value) { + void setMetaData(int index, const QString &key, const QVariant &value) { _streams[index].metaData.insert(key, value); } bool isActive(int index) { return _streams.at(index).active; } @@ -68,7 +68,7 @@ private: { Stream() : type(UnknownStream), active(false) {} StreamType type; - QMap<QtMultimedia::MetaData, QVariant> metaData; + QMap<QString, QVariant> metaData; bool active; }; |