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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/camera/camera.cpp | 2 | ||||
| -rw-r--r-- | examples/player/player.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/examples/camera/camera.cpp b/examples/camera/camera.cpp index f2f7d22ab..bb4497fe8 100644 --- a/examples/camera/camera.cpp +++ b/examples/camera/camera.cpp @@ -124,7 +124,7 @@ void Camera::setCamera(const QByteArray &cameraDevice) connect(mediaRecorder, SIGNAL(durationChanged(qint64)), this, SLOT(updateRecordTime())); connect(mediaRecorder, SIGNAL(error(QMediaRecorder::Error)), this, SLOT(displayRecorderError())); - mediaRecorder->setMetaData(QtMultimedia::Title, QVariant(QLatin1String("Test Title"))); + mediaRecorder->setMetaData(QtMultimedia::MetaData::Title, QVariant(QLatin1String("Test Title"))); connect(ui->exposureCompensation, SIGNAL(valueChanged(int)), SLOT(setExposureCompensation(int))); diff --git a/examples/player/player.cpp b/examples/player/player.cpp index 43120bc04..2644f5691 100644 --- a/examples/player/player.cpp +++ b/examples/player/player.cpp @@ -221,14 +221,13 @@ void Player::positionChanged(qint64 progress) void Player::metaDataChanged() { - //qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString(); if (player->isMetaDataAvailable()) { setTrackInfo(QString("%1 - %2") - .arg(player->metaData(QtMultimedia::AlbumArtist).toString()) - .arg(player->metaData(QtMultimedia::Title).toString())); + .arg(player->metaData(QtMultimedia::MetaData::AlbumArtist).toString()) + .arg(player->metaData(QtMultimedia::MetaData::Title).toString())); if (coverLabel) { - QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>(); + QUrl url = player->metaData(QtMultimedia::MetaData::CoverArtUrlLarge).value<QUrl>(); coverLabel->setPixmap(!url.isEmpty() ? QPixmap(url.toString()) |