diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-15 09:08:00 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 03:32:49 (GMT) |
| commit | 441a2dea20b5d4aa2a4d477cf01e0959ac87fe13 (patch) | |
| tree | 4a593284c88995b9c54218da6072aaa702af459e /demos | |
| parent | 2f89bb3c6ec37178ab7bed0e172b61d017e33d75 (diff) | |
| download | Qt-441a2dea20b5d4aa2a4d477cf01e0959ac87fe13.zip Qt-441a2dea20b5d4aa2a4d477cf01e0959ac87fe13.tar.gz Qt-441a2dea20b5d4aa2a4d477cf01e0959ac87fe13.tar.bz2 | |
Create Mediaservices lib, separate from Multimedia.
(cherry picked from commit e85223d233c0e1d6beca748332b8fbaba3ebbf2d)
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/multimedia/player/player.cpp | 12 | ||||
| -rw-r--r-- | demos/multimedia/player/player.pro | 2 | ||||
| -rw-r--r-- | demos/multimedia/player/playercontrols.h | 2 | ||||
| -rw-r--r-- | demos/multimedia/player/videowidget.h | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/demos/multimedia/player/player.cpp b/demos/multimedia/player/player.cpp index af30a97..20341bc 100644 --- a/demos/multimedia/player/player.cpp +++ b/demos/multimedia/player/player.cpp @@ -45,8 +45,8 @@ #include "playlistmodel.h" #include "videowidget.h" -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaplaylist.h> +#include <QtMediaservices/qmediaservice.h> +#include <QtMediaservices/qmediaplaylist.h> #include <QtGui> @@ -204,14 +204,14 @@ void Player::positionChanged(qint64 progress) void Player::metaDataChanged() { - //qDebug() << "update metadata" << player->metaData(QtMultimedia::Title).toString(); + //qDebug() << "update metadata" << player->metaData(QtMediaservices::Title).toString(); if (player->isMetaDataAvailable()) { setTrackInfo(QString("%1 - %2") - .arg(player->metaData(QtMultimedia::AlbumArtist).toString()) - .arg(player->metaData(QtMultimedia::Title).toString())); + .arg(player->metaData(QtMediaservices::AlbumArtist).toString()) + .arg(player->metaData(QtMediaservices::Title).toString())); if (coverLabel) { - QUrl url = player->metaData(QtMultimedia::CoverArtUrlLarge).value<QUrl>(); + QUrl url = player->metaData(QtMediaservices::CoverArtUrlLarge).value<QUrl>(); coverLabel->setPixmap(!url.isEmpty() ? QPixmap(url.toString()) diff --git a/demos/multimedia/player/player.pro b/demos/multimedia/player/player.pro index dc731e4..fb93416 100644 --- a/demos/multimedia/player/player.pro +++ b/demos/multimedia/player/player.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = player -QT += gui multimedia +QT += gui mediaservices HEADERS = \ diff --git a/demos/multimedia/player/playercontrols.h b/demos/multimedia/player/playercontrols.h index 99894ff..0b0b0e6 100644 --- a/demos/multimedia/player/playercontrols.h +++ b/demos/multimedia/player/playercontrols.h @@ -42,7 +42,7 @@ #ifndef PLAYERCONTROLS_H #define PLAYERCONTROLS_H -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaservices/qmediaplayer.h> #include <QtGui/qwidget.h> diff --git a/demos/multimedia/player/videowidget.h b/demos/multimedia/player/videowidget.h index 543e1e0..0251bfe 100644 --- a/demos/multimedia/player/videowidget.h +++ b/demos/multimedia/player/videowidget.h @@ -41,7 +41,7 @@ #ifndef VIDEOWIDGET_H #define VIDEOWIDGET_H -#include <QtMultimedia/qvideowidget.h> +#include <QtMediaservices/qvideowidget.h> QT_BEGIN_HEADER |