slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename QtMultimediaKit to QtMultimedia.

Browse Source 
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Michael Goddard
2011-10-06 14:31:58 +10:00
committed by Qt by Nokia
parent 55bc4f2b46
commit 03f22bcdaf
395 changed files with 1393 additions and 3088 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/qmultimedia_common/mockcameraimagecapturecontrol.h
View File

@@ -95,11 +95,11 @@ private Q_SLOTS:
emit imageCaptured(m_captureRequest, QImage());
emit imageMetadataAvailable(m_captureRequest,
QtMultimediaKit::FocalLengthIn35mmFilm,
QtMultimedia::FocalLengthIn35mmFilm,
QVariant(50));
emit imageMetadataAvailable(m_captureRequest,
QtMultimediaKit::DateTimeOriginal,
QtMultimedia::DateTimeOriginal,
QVariant(QDateTime::currentDateTime()));
emit imageMetadataAvailable(m_captureRequest,

10
tests/auto/qmultimedia_common/mockcameraservice.h
View File

@@ -56,7 +56,7 @@
#include "../qmultimedia_common/mockvideosurface.h"
#include "../qmultimedia_common/mockvideorenderercontrol.h"
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
#include "../qmultimedia_common/mockvideowindowcontrol.h"
#endif
@@ -105,7 +105,7 @@ public:
mockImageProcessingControl = new MockImageProcessingControl(this);
mockImageEncoderControl = new MockImageEncoderControl(this);
rendererControl = new MockVideoRendererControl(this);
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
windowControl = new MockVideoWindowControl(this);
#endif
rendererRef = 0;
@@ -154,7 +154,7 @@ public:
return rendererControl;
}
}
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
if (qstrcmp(iid, QVideoWindowControl_iid) == 0) {
if (windowRef == 0) {
windowRef += 1;
@@ -169,7 +169,7 @@ public:
{
if (control == rendererControl)
rendererRef -= 1;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
if (control == windowControl)
windowRef -= 1;
#endif
@@ -186,7 +186,7 @@ public:
MockImageProcessingControl *mockImageProcessingControl;
MockImageEncoderControl *mockImageEncoderControl;
MockVideoRendererControl *rendererControl;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
MockVideoWindowControl *windowControl;
#endif
int rendererRef;

4
tests/auto/qmultimedia_common/mockimageencodercontrol.h
View File

@@ -65,12 +65,12 @@ public:
settings.resolution() == QSize(320,240))
resolutions << settings.resolution();
if (settings.quality() == QtMultimediaKit::HighQuality && settings.resolution() == QSize(640,480))
if (settings.quality() == QtMultimedia::HighQuality && settings.resolution() == QSize(640,480))
resolutions << settings.resolution();
} else {
resolutions << QSize(160, 120);
resolutions << QSize(320, 240);
if (settings.quality() == QtMultimediaKit::HighQuality)
if (settings.quality() == QtMultimedia::HighQuality)
resolutions << QSize(640, 480);
}

12
tests/auto/qmultimedia_common/mockmediaplayerservice.h
View File

@@ -48,7 +48,7 @@
#include "mockmediastreamscontrol.h"
#include "mockmedianetworkaccesscontrol.h"
#include "mockvideorenderercontrol.h"
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
#include "mockvideowindowcontrol.h"
#endif
@@ -64,7 +64,7 @@ public:
mockNetworkControl = new MockNetworkAccessControl;
rendererControl = new MockVideoRendererControl;
rendererRef = 0;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
windowControl = new MockVideoWindowControl;
windowRef = 0;
#endif
@@ -76,7 +76,7 @@ public:
delete mockStreamsControl;
delete mockNetworkControl;
delete rendererControl;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
delete windowControl;
#endif
}
@@ -91,7 +91,7 @@ public:
return rendererControl;
}
}
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
if (qstrcmp(iid, QVideoWindowControl_iid) == 0) {
if (windowRef == 0) {
windowRef += 1;
@@ -109,7 +109,7 @@ public:
{
if (control == rendererControl)
rendererRef -= 1;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
if (control == windowControl)
windowRef -= 1;
#endif
@@ -164,7 +164,7 @@ public:
MockStreamsControl *mockStreamsControl;
MockNetworkAccessControl *mockNetworkControl;
MockVideoRendererControl *rendererControl;
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
MockVideoWindowControl *windowControl;
int windowRef;
#endif

6
tests/auto/qmultimedia_common/mockmediastreamscontrol.h
View File

@@ -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, QtMultimediaKit::MetaData key) {
QVariant metaData(int index, QtMultimedia::MetaData key) {
return _streams.at(index).metaData.value(key); }
void setMetaData(int index, QtMultimediaKit::MetaData key, const QVariant &value) {
void setMetaData(int index, QtMultimedia::MetaData 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<QtMultimediaKit::MetaData, QVariant> metaData;
QMap<QtMultimedia::MetaData, QVariant> metaData;
bool active;
};

6
tests/auto/qmultimedia_common/mockmetadatareadercontrol.h
View File

@@ -63,12 +63,12 @@ public:
if (m_available != available)
emit metaDataAvailableChanged(m_available = available);
}
QList<QtMultimediaKit::MetaData> availableMetaData() const
QList<QtMultimedia::MetaData> availableMetaData() const
{
return m_data.keys();
}
QVariant metaData(QtMultimediaKit::MetaData key) const
QVariant metaData(QtMultimedia::MetaData key) const
{
return m_data.value(key);
}
@@ -91,7 +91,7 @@ public:
}
bool m_available;
QMap<QtMultimediaKit::MetaData, QVariant> m_data;
QMap<QtMultimedia::MetaData, QVariant> m_data;
QMap<QString, QVariant> m_extendedData;
};

8
tests/auto/qmultimedia_common/mockmetadatawritercontrol.h
View File

@@ -64,13 +64,13 @@ public:
if (m_available != available)
emit metaDataAvailableChanged(m_available = available);
}
QList<QtMultimediaKit::MetaData> availableMetaData() const { return m_data.keys(); }
QList<QtMultimedia::MetaData> availableMetaData() const { return m_data.keys(); }
bool isWritable() const { return m_writable; }
void setWritable(bool writable) { emit writableChanged(m_writable = writable); }
QVariant metaData(QtMultimediaKit::MetaData key) const { return m_data.value(key); }//Getting the metadata from Multimediakit
void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value)
QVariant metaData(QtMultimedia::MetaData key) const { return m_data.value(key); }//Getting the metadata from Multimediakit
void setMetaData(QtMultimedia::MetaData key, const QVariant &value)
{
m_data.insert(key, value);
}
@@ -100,7 +100,7 @@ public:
bool m_available;
bool m_writable;
QMap<QtMultimediaKit::MetaData, QVariant> m_data;
QMap<QtMultimedia::MetaData, QVariant> m_data;
QMap<QString, QVariant> m_extendedData;
};

4
tests/auto/qmultimedia_common/mockradiotunercontrol.h
View File

@@ -70,9 +70,9 @@ public:
{
return true;
}
QtMultimediaKit::AvailabilityError availabilityError() const
QtMultimedia::AvailabilityError availabilityError() const
{
return QtMultimediaKit::NoError;
return QtMultimedia::NoError;
}
QRadioTuner::Band band() const

4
tests/auto/qmultimedia_common/mockvideo.pri
View File

@@ -3,9 +3,9 @@ INCLUDEPATH += $$PWD \
../../../src/multimedia \
../../../src/multimedia/video
contains(QT,multimediakitwidgets)|contains(QT,multimediakitwidgets-private) {
contains(QT,multimediawidgets)|contains(QT,multimediawidgets-private) {
HEADERS *= ../qmultimedia_common/mockvideowindowcontrol.h
DEFINES *= QT_MULTIMEDIAKIT_MOCK_WIDGETS
DEFINES *= QT_MULTIMEDIA_MOCK_WIDGETS
}
HEADERS *= \

4
tests/auto/qmultimedia_common/mockvideowindowcontrol.h
View File

@@ -42,7 +42,7 @@
#ifndef MOCKVIDEOWINDOWCONTROL_H
#define MOCKVIDEOWINDOWCONTROL_H
#if defined(QT_MULTIMEDIAKIT_MOCK_WIDGETS)
#if defined(QT_MULTIMEDIA_MOCK_WIDGETS)
#include "qvideowindowcontrol.h"
@@ -70,5 +70,5 @@ public:
void setSaturation(int) {}
};
#endif // QT_MULTIMEDIAKIT_MOCK_WIDGETS
#endif // QT_MULTIMEDIA_MOCK_WIDGETS
#endif // MOCKVIDEOWINDOWCONTROL_H