diff options
Diffstat (limited to 'tests/auto')
32 files changed, 147 insertions, 140 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c0004f7..12ebc75 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -16,6 +16,7 @@ unix:!embedded:contains(QT_CONFIG, dbus): SUBDIRS += dbus.pro contains(QT_CONFIG, script): SUBDIRS += script.pro contains(QT_CONFIG, webkit): SUBDIRS += webkit.pro contains(QT_CONFIG, multimedia): SUBDIRS += multimedia.pro +contains(QT_CONFIG, mediaservices): SUBDIRS += mediaservices.pro contains(QT_CONFIG, phonon): SUBDIRS += phonon.pro contains(QT_CONFIG, svg): SUBDIRS += svg.pro contains(QT_CONFIG, declarative): SUBDIRS += declarative.pro diff --git a/tests/auto/mediaservices.pro b/tests/auto/mediaservices.pro new file mode 100644 index 0000000..1b50cd7 --- /dev/null +++ b/tests/auto/mediaservices.pro @@ -0,0 +1,19 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qsoundeffect \ + qdeclarativeaudio \ + qdeclarativevideo \ + qgraphicsvideoitem \ + qmediacontent \ + qmediaobject \ + qmediaplayer \ + qmediaplaylist \ + qmediaplaylistnavigator \ + qmediapluginloader \ + qmediaresource \ + qmediaservice \ + qmediaserviceprovider \ + qmediatimerange \ + qvideowidget + + diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro index f55d6e4..0a89f53 100644 --- a/tests/auto/multimedia.pro +++ b/tests/auto/multimedia.pro @@ -6,21 +6,6 @@ SUBDIRS=\ qaudioformat \ qaudioinput \ qaudiooutput \ - qsoundeffect \ - qdeclarativeaudio \ - qdeclarativevideo \ - qgraphicsvideoitem \ - qmediacontent \ - qmediaobject \ - qmediaplayer \ - qmediaplaylist \ - qmediaplaylistnavigator \ - qmediapluginloader \ - qmediaresource \ - qmediaservice \ - qmediaserviceprovider \ - qmediatimerange \ qvideoframe \ - qvideosurfaceformat \ - qvideowidget \ + qvideosurfaceformat diff --git a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro index 7779efc..ecfe299 100644 --- a/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro +++ b/tests/auto/qdeclarativeaudio/qdeclarativeaudio.pro @@ -11,4 +11,4 @@ SOURCES += \ $$PWD/../../../src/imports/multimedia/qdeclarativemediabase.cpp \ $$PWD/../../../src/imports/multimedia/qmetadatacontrolmetaobject.cpp -QT += multimedia declarative +QT += mediaservices declarative diff --git a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index af0ed76..e393599 100644 --- a/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -44,9 +44,9 @@ #include "../../../src/imports/multimedia/qdeclarativeaudio_p.h" #include <QtGui/qapplication.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaServices/qmediaplayercontrol.h> +#include <QtMediaServices/qmediaservice.h> +#include <QtMediaServices/qmetadatacontrol.h> class tst_QDeclarativeAudio : public QObject @@ -77,7 +77,7 @@ private slots: void error(); }; -Q_DECLARE_METATYPE(QtMultimedia::MetaData); +Q_DECLARE_METATYPE(QtMediaServices::MetaData); Q_DECLARE_METATYPE(QDeclarativeAudio::Error); class QtTestMediaPlayerControl : public QMediaPlayerControl @@ -193,20 +193,20 @@ public: bool isWritable() const { return true; } bool isMetaDataAvailable() const { return true; } - QVariant metaData(QtMultimedia::MetaData key) const { return m_metaData.value(key); } - void setMetaData(QtMultimedia::MetaData key, const QVariant &value) { + QVariant metaData(QtMediaServices::MetaData key) const { return m_metaData.value(key); } + void setMetaData(QtMediaServices::MetaData key, const QVariant &value) { m_metaData.insert(key, value); emit metaDataChanged(); } - void setMetaData(const QMap<QtMultimedia::MetaData, QVariant> &metaData) { + void setMetaData(const QMap<QtMediaServices::MetaData, QVariant> &metaData) { m_metaData = metaData; emit metaDataChanged(); } - QList<QtMultimedia::MetaData> availableMetaData() const { return m_metaData.keys(); } + QList<QtMediaServices::MetaData> availableMetaData() const { return m_metaData.keys(); } QVariant extendedMetaData(const QString &) const { return QVariant(); } void setExtendedMetaData(const QString &, const QVariant &) {} QStringList availableExtendedMetaData() const { return QStringList(); } private: - QMap<QtMultimedia::MetaData, QVariant> m_metaData; + QMap<QtMediaServices::MetaData, QVariant> m_metaData; }; class QtTestMediaService : public QMediaService @@ -1156,25 +1156,25 @@ void tst_QDeclarativeAudio::status() void tst_QDeclarativeAudio::metaData_data() { QTest::addColumn<QByteArray>("propertyName"); - QTest::addColumn<QtMultimedia::MetaData>("propertyKey"); + QTest::addColumn<QtMediaServices::MetaData>("propertyKey"); QTest::addColumn<QVariant>("value1"); QTest::addColumn<QVariant>("value2"); QTest::newRow("title") << QByteArray("title") - << QtMultimedia::Title + << QtMediaServices::Title << QVariant(QString::fromLatin1("This is a title")) << QVariant(QString::fromLatin1("This is another title")); QTest::newRow("genre") << QByteArray("genre") - << QtMultimedia::Genre + << QtMediaServices::Genre << QVariant(QString::fromLatin1("rock")) << QVariant(QString::fromLatin1("pop")); QTest::newRow("trackNumber") << QByteArray("trackNumber") - << QtMultimedia::TrackNumber + << QtMediaServices::TrackNumber << QVariant(8) << QVariant(12); } @@ -1182,7 +1182,7 @@ void tst_QDeclarativeAudio::metaData_data() void tst_QDeclarativeAudio::metaData() { QFETCH(QByteArray, propertyName); - QFETCH(QtMultimedia::MetaData, propertyKey); + QFETCH(QtMediaServices::MetaData, propertyKey); QFETCH(QVariant, value1); QFETCH(QVariant, value2); diff --git a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro index 4cd4c71..64a20da 100644 --- a/tests/auto/qdeclarativevideo/qdeclarativevideo.pro +++ b/tests/auto/qdeclarativevideo/qdeclarativevideo.pro @@ -11,4 +11,4 @@ SOURCES += \ $$PWD/../../../src/imports/multimedia/qdeclarativemediabase.cpp \ $$PWD/../../../src/imports/multimedia/qmetadatacontrolmetaobject.cpp -QT += multimedia declarative +QT += multimedia mediaservices declarative diff --git a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp index 0fbd78c..99b447a 100644 --- a/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp +++ b/tests/auto/qdeclarativevideo/tst_qdeclarativevideo.cpp @@ -45,11 +45,11 @@ #include <QtGui/qapplication.h> #include <QtMultimedia/qabstractvideosurface.h> -#include <QtMultimedia/qgraphicsvideoitem.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qvideooutputcontrol.h> -#include <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaServices/qgraphicsvideoitem.h> +#include <QtMediaServices/qmediaplayercontrol.h> +#include <QtMediaServices/qmediaservice.h> +#include <QtMediaServices/qvideooutputcontrol.h> +#include <QtMediaServices/qvideorenderercontrol.h> #include <QtMultimedia/qvideosurfaceformat.h> @@ -73,7 +73,7 @@ private slots: void geometry(); }; -Q_DECLARE_METATYPE(QtMultimedia::MetaData); +Q_DECLARE_METATYPE(QtMediaServices::MetaData); Q_DECLARE_METATYPE(QDeclarativeVideo::Error); class QtTestMediaPlayerControl : public QMediaPlayerControl diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro index da00baf..b57e8e3 100644 --- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro +++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro @@ -1,5 +1,5 @@ load(qttest_p4) SOURCES += tst_qgraphicsvideoitem.cpp -QT += multimedia -requires(contains(QT_CONFIG, multimedia)) +QT += multimedia mediaservices +requires(contains(QT_CONFIG, mediaservices)) diff --git a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp index 7fb6005..1815779 100644 --- a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp +++ b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp @@ -41,19 +41,19 @@ #include <QtTest/QtTest> -#include <QtMultimedia/qgraphicsvideoitem.h> +#include <QtMediaServices/qgraphicsvideoitem.h> #include <QtGui/qapplication.h> #include <QtGui/qgraphicsscene.h> #include <QtGui/qgraphicsview.h> #include <QtMultimedia/qabstractvideosurface.h> -#include <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qvideooutputcontrol.h> -#include <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaServices/qmediaobject.h> +#include <QtMediaServices/qmediaservice.h> +#include <QtMediaServices/qvideooutputcontrol.h> +#include <QtMediaServices/qvideorenderercontrol.h> #include <QtMultimedia/qvideosurfaceformat.h> -#include <QtMultimedia/private/qpaintervideosurface_p.h> +#include <QtMediaServices/private/qpaintervideosurface_p.h> class tst_QGraphicsVideoItem : public QObject { diff --git a/tests/auto/qmediacontent/qmediacontent.pro b/tests/auto/qmediacontent/qmediacontent.pro index 6c13c8b..e20b4db 100644 --- a/tests/auto/qmediacontent/qmediacontent.pro +++ b/tests/auto/qmediacontent/qmediacontent.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES += tst_qmediacontent.cpp -QT = core network multimedia +QT = core network mediaservices diff --git a/tests/auto/qmediacontent/tst_qmediacontent.cpp b/tests/auto/qmediacontent/tst_qmediacontent.cpp index a0a9bdb..e33149a 100644 --- a/tests/auto/qmediacontent/tst_qmediacontent.cpp +++ b/tests/auto/qmediacontent/tst_qmediacontent.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> -#include <QtMultimedia/qmediacontent.h> +#include <QtMediaServices/qmediacontent.h> class tst_QMediaContent : public QObject diff --git a/tests/auto/qmediaobject/qmediaobject.pro b/tests/auto/qmediaobject/qmediaobject.pro index e59bfdc..d6a0f7b 100644 --- a/tests/auto/qmediaobject/qmediaobject.pro +++ b/tests/auto/qmediaobject/qmediaobject.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qmediaobject.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediaobject/tst_qmediaobject.cpp b/tests/auto/qmediaobject/tst_qmediaobject.cpp index 2128b35..5a2fdeb 100644 --- a/tests/auto/qmediaobject/tst_qmediaobject.cpp +++ b/tests/auto/qmediaobject/tst_qmediaobject.cpp @@ -43,9 +43,9 @@ #include <QtCore/qtimer.h> -#include <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmetadatacontrol.h> +#include <QtMediaServices/qmediaobject.h> +#include <QtMediaServices/qmediaservice.h> +#include <QtMediaServices/qmetadatacontrol.h> class tst_QMediaObject : public QObject @@ -93,13 +93,13 @@ public: if (m_available != available) emit metaDataAvailableChanged(m_available = available); } - QList<QtMultimedia::MetaData> availableMetaData() const { return m_data.keys(); } + QList<QtMediaServices::MetaData> availableMetaData() const { return m_data.keys(); } bool isWritable() const { return m_writable; } void setWritable(bool writable) { emit writableChanged(m_writable = writable); } - QVariant metaData(QtMultimedia::MetaData key) const { return m_data.value(key); } - void setMetaData(QtMultimedia::MetaData key, const QVariant &value) { + QVariant metaData(QtMediaServices::MetaData key) const { return m_data.value(key); } + void setMetaData(QtMediaServices::MetaData key, const QVariant &value) { m_data.insert(key, value); } QVariant extendedMetaData(const QString &key) const { return m_extendedData.value(key); } @@ -117,7 +117,7 @@ public: bool m_available; bool m_writable; - QMap<QtMultimedia::MetaData, QVariant> m_data; + QMap<QtMediaServices::MetaData, QVariant> m_data; QMap<QString, QVariant> m_extendedData; }; @@ -376,12 +376,12 @@ void tst_QMediaObject::nullMetaDataControl() QCOMPARE(object.isMetaDataAvailable(), false); QCOMPARE(object.isMetaDataWritable(), false); - object.setMetaData(QtMultimedia::Title, title); + object.setMetaData(QtMediaServices::Title, title); object.setExtendedMetaData(titleKey, title); - QCOMPARE(object.metaData(QtMultimedia::Title).toString(), QString()); + QCOMPARE(object.metaData(QtMediaServices::Title).toString(), QString()); QCOMPARE(object.extendedMetaData(titleKey).toString(), QString()); - QCOMPARE(object.availableMetaData(), QList<QtMultimedia::MetaData>()); + QCOMPARE(object.availableMetaData(), QList<QtMediaServices::MetaData>()); QCOMPARE(object.availableExtendedMetaData(), QStringList()); QCOMPARE(spy.count(), 0); } @@ -470,18 +470,18 @@ void tst_QMediaObject::metaData() QtTestMediaObject object(&service); QVERIFY(object.availableMetaData().isEmpty()); - service.metaData.m_data.insert(QtMultimedia::AlbumArtist, artist); - service.metaData.m_data.insert(QtMultimedia::Title, title); - service.metaData.m_data.insert(QtMultimedia::Genre, genre); + service.metaData.m_data.insert(QtMediaServices::AlbumArtist, artist); + service.metaData.m_data.insert(QtMediaServices::Title, title); + service.metaData.m_data.insert(QtMediaServices::Genre, genre); - QCOMPARE(object.metaData(QtMultimedia::AlbumArtist).toString(), artist); - QCOMPARE(object.metaData(QtMultimedia::Title).toString(), title); + QCOMPARE(object.metaData(QtMediaServices::AlbumArtist).toString(), artist); + QCOMPARE(object.metaData(QtMediaServices::Title).toString(), title); - QList<QtMultimedia::MetaData> metaDataKeys = object.availableMetaData(); + QList<QtMediaServices::MetaData> metaDataKeys = object.availableMetaData(); QCOMPARE(metaDataKeys.size(), 3); - QVERIFY(metaDataKeys.contains(QtMultimedia::AlbumArtist)); - QVERIFY(metaDataKeys.contains(QtMultimedia::Title)); - QVERIFY(metaDataKeys.contains(QtMultimedia::Genre)); + QVERIFY(metaDataKeys.contains(QtMediaServices::AlbumArtist)); + QVERIFY(metaDataKeys.contains(QtMediaServices::Title)); + QVERIFY(metaDataKeys.contains(QtMediaServices::Genre)); } void tst_QMediaObject::setMetaData_data() @@ -501,9 +501,9 @@ void tst_QMediaObject::setMetaData() QtTestMediaObject object(&service); - object.setMetaData(QtMultimedia::Title, title); - QCOMPARE(object.metaData(QtMultimedia::Title).toString(), title); - QCOMPARE(service.metaData.m_data.value(QtMultimedia::Title).toString(), title); + object.setMetaData(QtMediaServices::Title, title); + QCOMPARE(object.metaData(QtMediaServices::Title).toString(), title); + QCOMPARE(service.metaData.m_data.value(QtMediaServices::Title).toString(), title); } void tst_QMediaObject::extendedMetaData() diff --git a/tests/auto/qmediaplayer/qmediaplayer.pro b/tests/auto/qmediaplayer/qmediaplayer.pro index 21008f9..f355078 100644 --- a/tests/auto/qmediaplayer/qmediaplayer.pro +++ b/tests/auto/qmediaplayer/qmediaplayer.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES += tst_qmediaplayer.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp index a96e08d..9a597e2 100644 --- a/tests/auto/qmediaplayer/tst_qmediaplayer.cpp +++ b/tests/auto/qmediaplayer/tst_qmediaplayer.cpp @@ -43,10 +43,10 @@ #include <QtCore/qdebug.h> #include <QtCore/qbuffer.h> -#include <QtMultimedia/qmediaplayer.h> -#include <QtMultimedia/qmediaplayercontrol.h> -#include <QtMultimedia/qmediaplaylist.h> -#include <QtMultimedia/qmediaservice.h> +#include <QtMediaServices/qmediaplayer.h> +#include <QtMediaServices/qmediaplayercontrol.h> +#include <QtMediaServices/qmediaplaylist.h> +#include <QtMediaServices/qmediaservice.h> diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/qmediaplaylist/qmediaplaylist.pro index b114bda..809473b 100644 --- a/tests/auto/qmediaplaylist/qmediaplaylist.pro +++ b/tests/auto/qmediaplaylist/qmediaplaylist.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaplaylist.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp index 383a407..1037f37 100644 --- a/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp +++ b/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp @@ -41,11 +41,11 @@ #include <QtTest/QtTest> #include <QDebug> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaplaylist.h> -#include <QtMultimedia/qmediaplaylistcontrol.h> -#include <QtMultimedia/qmediaplaylistnavigator.h> -#include <QtMultimedia/private/qmediapluginloader_p.h> +#include <QtMediaServices/qmediaservice.h> +#include <QtMediaServices/qmediaplaylist.h> +#include <QtMediaServices/qmediaplaylistcontrol.h> +#include <QtMediaServices/qmediaplaylistnavigator.h> +#include <QtMediaServices/private/qmediapluginloader_p.h> class MockReadOnlyPlaylistProvider : public QMediaPlaylistProvider diff --git a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro index ea9bc0f..3265762 100644 --- a/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro +++ b/tests/auto/qmediaplaylistnavigator/qmediaplaylistnavigator.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaplaylistnavigator.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp b/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp index 9130db0..04f736c 100644 --- a/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp +++ b/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp @@ -41,8 +41,8 @@ #include <QtTest/QtTest> #include <QDebug> -#include <QtMultimedia/qlocalmediaplaylistprovider.h> -#include <QtMultimedia/qmediaplaylistnavigator.h> +#include <QtMediaServices/qlocalmediaplaylistprovider.h> +#include <QtMediaServices/qmediaplaylistnavigator.h> class tst_QMediaPlaylistNavigator : public QObject diff --git a/tests/auto/qmediapluginloader/qmediapluginloader.pro b/tests/auto/qmediapluginloader/qmediapluginloader.pro index 66950e9..a47cc57 100644 --- a/tests/auto/qmediapluginloader/qmediapluginloader.pro +++ b/tests/auto/qmediapluginloader/qmediapluginloader.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediapluginloader.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp b/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp index 0d35b05..001e68a 100644 --- a/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp +++ b/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp @@ -42,8 +42,8 @@ #include <QtTest/QtTest> #include <QDebug> -#include <QtMultimedia/private/qmediapluginloader_p.h> -#include <QtMultimedia/qmediaserviceproviderplugin.h> +#include <QtMediaServices/private/qmediapluginloader_p.h> +#include <QtMediaServices/qmediaserviceproviderplugin.h> diff --git a/tests/auto/qmediaresource/qmediaresource.pro b/tests/auto/qmediaresource/qmediaresource.pro index c8e3d9c..64669a2 100644 --- a/tests/auto/qmediaresource/qmediaresource.pro +++ b/tests/auto/qmediaresource/qmediaresource.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaresource.cpp -QT = core multimedia network +QT = core mediaservices network diff --git a/tests/auto/qmediaresource/tst_qmediaresource.cpp b/tests/auto/qmediaresource/tst_qmediaresource.cpp index 546c415..984cfef 100644 --- a/tests/auto/qmediaresource/tst_qmediaresource.cpp +++ b/tests/auto/qmediaresource/tst_qmediaresource.cpp @@ -41,7 +41,7 @@ #include <QtTest/QtTest> -#include <QtMultimedia/qmediaresource.h> +#include <QtMediaServices/qmediaresource.h> class tst_QMediaResource : public QObject diff --git a/tests/auto/qmediaservice/qmediaservice.pro b/tests/auto/qmediaservice/qmediaservice.pro index f877665..8acd03a 100644 --- a/tests/auto/qmediaservice/qmediaservice.pro +++ b/tests/auto/qmediaservice/qmediaservice.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaservice.cpp -QT = core gui multimedia +QT = core gui mediaservices diff --git a/tests/auto/qmediaservice/tst_qmediaservice.cpp b/tests/auto/qmediaservice/tst_qmediaservice.cpp index a0cb69d..a544e77 100644 --- a/tests/auto/qmediaservice/tst_qmediaservice.cpp +++ b/tests/auto/qmediaservice/tst_qmediaservice.cpp @@ -41,9 +41,9 @@ #include <QtTest/QtTest> -#include <QtMultimedia/qvideodevicecontrol.h> -#include <QtMultimedia/qmediacontrol.h> -#include <QtMultimedia/qmediaservice.h> +#include <QtMediaServices/qvideodevicecontrol.h> +#include <QtMediaServices/qmediacontrol.h> +#include <QtMediaServices/qmediaservice.h> #include <QtGui/qapplication.h> #include <QtGui/qstyle.h> diff --git a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro index 9aaa9e5..69b3864 100644 --- a/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro +++ b/tests/auto/qmediaserviceprovider/qmediaserviceprovider.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediaserviceprovider.cpp -QT = core gui multimedia +QT = core gui mediaservices diff --git a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index 06a8f60..64abedb 100644 --- a/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -43,12 +43,12 @@ #include <QDebug> #include <QStringList> -#include <QtMultimedia/qmediaserviceprovider.h> -#include <QtMultimedia/qmediaserviceproviderplugin.h> -#include <QtMultimedia/private/qmediapluginloader_p.h> -#include <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/qmediaplayer.h> +#include <QtMediaServices/qmediaserviceprovider.h> +#include <QtMediaServices/qmediaserviceproviderplugin.h> +#include <QtMediaServices/private/qmediapluginloader_p.h> +#include <QtMediaServices/qmediaobject.h> +#include <QtMediaServices/qmediaservice.h> +#include <QtMediaServices/qmediaplayer.h> class MockMediaService : public QMediaService { @@ -88,16 +88,16 @@ public: delete service; } - QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const + QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const { if (codecs.contains(QLatin1String("mpeg4"))) - return QtMultimedia::NotSupported; + return QtMediaServices::NotSupported; if (mimeType == "audio/ogg") { - return QtMultimedia::ProbablySupported; + return QtMediaServices::ProbablySupported; } - return QtMultimedia::MaybeSupported; + return QtMediaServices::MaybeSupported; } QStringList supportedMimeTypes() const @@ -147,14 +147,14 @@ public: delete service; } - QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const + QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const { Q_UNUSED(codecs); if (mimeType == "audio/wav") - return QtMultimedia::PreferredService; + return QtMediaServices::PreferredService; - return QtMultimedia::NotSupported; + return QtMediaServices::NotSupported; } QStringList supportedMimeTypes() const @@ -239,15 +239,15 @@ public: delete service; } - QtMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const + QtMediaServices::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const { if (codecs.contains(QLatin1String("jpeg2000"))) - return QtMultimedia::NotSupported; + return QtMediaServices::NotSupported; if (supportedMimeTypes().contains(mimeType)) - return QtMultimedia::ProbablySupported; + return QtMediaServices::ProbablySupported; - return QtMultimedia::MaybeSupported; + return QtMediaServices::MaybeSupported; } QStringList supportedMimeTypes() const @@ -334,7 +334,7 @@ void tst_QMediaServiceProvider::testHasSupport() { MockMediaServiceProvider mockProvider; QCOMPARE(mockProvider.hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()), - QtMultimedia::MaybeSupported); + QtMediaServices::MaybeSupported); QMediaServiceProvider *provider = QMediaServiceProvider::defaultServiceProvider(); @@ -342,44 +342,44 @@ void tst_QMediaServiceProvider::testHasSupport() QSKIP("No default provider", SkipSingle); QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/ogv", QStringList()), - QtMultimedia::MaybeSupported); + QtMediaServices::MaybeSupported); QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/ogg", QStringList()), - QtMultimedia::ProbablySupported); + QtMediaServices::ProbablySupported); //while the service returns PreferredService, provider should return ProbablySupported QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "audio/wav", QStringList()), - QtMultimedia::ProbablySupported); + QtMediaServices::ProbablySupported); //even while all the plugins with "hasSupport" returned NotSupported, //MockServicePlugin3 has no "hasSupport" interface, so MaybeSupported QCOMPARE(provider->hasSupport(QByteArray(Q_MEDIASERVICE_MEDIAPLAYER), "video/avi", QStringList() << "mpeg4"), - QtMultimedia::MaybeSupported); + QtMediaServices::MaybeSupported); QCOMPARE(provider->hasSupport(QByteArray("non existing service"), "video/ogv", QStringList()), - QtMultimedia::NotSupported); + QtMediaServices::NotSupported); - QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QtMultimedia::MaybeSupported); - QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QtMultimedia::ProbablySupported); - QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QtMultimedia::ProbablySupported); + QCOMPARE(QMediaPlayer::hasSupport("video/ogv"), QtMediaServices::MaybeSupported); + QCOMPARE(QMediaPlayer::hasSupport("audio/ogg"), QtMediaServices::ProbablySupported); + QCOMPARE(QMediaPlayer::hasSupport("audio/wav"), QtMediaServices::ProbablySupported); //test low latency flag support QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::LowLatency), - QtMultimedia::ProbablySupported); + QtMediaServices::ProbablySupported); //plugin1 probably supports audio/ogg, it checked because it doesn't provide features iface QCOMPARE(QMediaPlayer::hasSupport("audio/ogg", QStringList(), QMediaPlayer::LowLatency), - QtMultimedia::ProbablySupported); + QtMediaServices::ProbablySupported); //Plugin4 is not checked here, sine it's known not support low latency QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::LowLatency), - QtMultimedia::MaybeSupported); + QtMediaServices::MaybeSupported); //test streaming flag support QCOMPARE(QMediaPlayer::hasSupport("video/quicktime", QStringList(), QMediaPlayer::StreamPlayback), - QtMultimedia::ProbablySupported); + QtMediaServices::ProbablySupported); //Plugin2 is not checked here, sine it's known not support streaming QCOMPARE(QMediaPlayer::hasSupport("audio/wav", QStringList(), QMediaPlayer::StreamPlayback), - QtMultimedia::MaybeSupported); + QtMediaServices::MaybeSupported); //ensure the correct media player plugin is choosen for mime type QMediaPlayer simplePlayer(0, QMediaPlayer::LowLatency); diff --git a/tests/auto/qmediatimerange/qmediatimerange.pro b/tests/auto/qmediatimerange/qmediatimerange.pro index b1b436e..c5e74ce 100644 --- a/tests/auto/qmediatimerange/qmediatimerange.pro +++ b/tests/auto/qmediatimerange/qmediatimerange.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qmediatimerange.cpp -QT = core multimedia +QT = core mediaservices diff --git a/tests/auto/qmediatimerange/tst_qmediatimerange.cpp b/tests/auto/qmediatimerange/tst_qmediatimerange.cpp index 54de3f1..a21abe2 100644 --- a/tests/auto/qmediatimerange/tst_qmediatimerange.cpp +++ b/tests/auto/qmediatimerange/tst_qmediatimerange.cpp @@ -42,7 +42,7 @@ #include <QtTest/QtTest> #include <QtCore/qdebug.h> -#include <QtMultimedia/qmediatimerange.h> +#include <QtMediaServices/qmediatimerange.h> class tst_QMediaTimeRange: public QObject { diff --git a/tests/auto/qsoundeffect/qsoundeffect.pro b/tests/auto/qsoundeffect/qsoundeffect.pro index eaa35b2..5344a16 100644 --- a/tests/auto/qsoundeffect/qsoundeffect.pro +++ b/tests/auto/qsoundeffect/qsoundeffect.pro @@ -2,7 +2,7 @@ load(qttest_p4) SOURCES += tst_qsoundeffect.cpp -QT = core multimedia +QT = core multimedia mediaservices wince* { deploy.sources += 4.wav diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro index ca0fc24..12686f3 100644 --- a/tests/auto/qvideowidget/qvideowidget.pro +++ b/tests/auto/qvideowidget/qvideowidget.pro @@ -2,5 +2,5 @@ load(qttest_p4) SOURCES = tst_qvideowidget.cpp -QT = core gui multimedia +QT = core gui multimedia mediaservices diff --git a/tests/auto/qvideowidget/tst_qvideowidget.cpp b/tests/auto/qvideowidget/tst_qvideowidget.cpp index f1eef50..8a54789 100644 --- a/tests/auto/qvideowidget/tst_qvideowidget.cpp +++ b/tests/auto/qvideowidget/tst_qvideowidget.cpp @@ -41,15 +41,15 @@ #include <QtTest/QtTest> -#include <QtMultimedia/qvideowidget.h> - -#include <QtMultimedia/qmediaobject.h> -#include <QtMultimedia/qmediaservice.h> -#include <QtMultimedia/private/qpaintervideosurface_p.h> -#include <QtMultimedia/qvideooutputcontrol.h> -#include <QtMultimedia/qvideowindowcontrol.h> -#include <QtMultimedia/qvideowidgetcontrol.h> -#include <QtMultimedia/qvideorenderercontrol.h> +#include <QtMediaServices/qvideowidget.h> + +#include <QtMediaServices/qmediaobject.h> +#include <QtMediaServices/qmediaservice.h> +#include <QtMediaServices/private/qpaintervideosurface_p.h> +#include <QtMediaServices/qvideooutputcontrol.h> +#include <QtMediaServices/qvideowindowcontrol.h> +#include <QtMediaServices/qvideowidgetcontrol.h> +#include <QtMediaServices/qvideorenderercontrol.h> #include <QtMultimedia/qabstractvideosurface.h> #include <QtMultimedia/qvideosurfaceformat.h> @@ -1589,7 +1589,9 @@ void tst_QVideoWidget::paintRendererControl() QCOMPARE(surface->isActive(), true); QCOMPARE(surface->isReady(), false); - QCoreApplication::processEvents(QEventLoop::AllEvents); + //wait up to 2 seconds for the frame to be presented + for (int i=0; i<200 && !surface->isReady(); i++) + QTest::qWait(10); QCOMPARE(surface->isActive(), true); QCOMPARE(surface->isReady(), true); |