summaryrefslogtreecommitdiffstats
path: root/src/plugins/directshow/player
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-02-14 12:09:58 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-14 13:25:04 +0100
commit4fc974fdefebb92bc22d87700c40d00a019e04a6 (patch)
tree19ef7bcc217ceeb62924a20407debf633248c085 /src/plugins/directshow/player
parent033d5859d2263c4bb411d1945c661358d82e7f63 (diff)
Fix MinGW-warnings about mismatched types.
Change-Id: I6170e3aa49f5b60ba68c1ef5bb2c6c7ec6688060 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src/plugins/directshow/player')
-rw-r--r--src/plugins/directshow/player/directshowiosource.cpp2
-rw-r--r--src/plugins/directshow/player/directshowmediatypelist.cpp2
-rw-r--r--src/plugins/directshow/player/videosurfacefilter.cpp7
3 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/directshow/player/directshowiosource.cpp b/src/plugins/directshow/player/directshowiosource.cpp
index ee2ea869a..9ed3aa22c 100644
--- a/src/plugins/directshow/player/directshowiosource.cpp
+++ b/src/plugins/directshow/player/directshowiosource.cpp
@@ -628,7 +628,7 @@ bool DirectShowRcSource::open(const QUrl &url)
qDebug("qrc file %s", qPrintable(m_file.fileName()));
if (m_file.open(QIODevice::ReadOnly)) {
- qDebug("Size %d", m_file.size());
+ qDebug("Size %d", int(m_file.size()));
qDebug("Sequential %d", int(m_file.isSequential()));
setDevice(&m_file);
diff --git a/src/plugins/directshow/player/directshowmediatypelist.cpp b/src/plugins/directshow/player/directshowmediatypelist.cpp
index c503580c0..75a12c40a 100644
--- a/src/plugins/directshow/player/directshowmediatypelist.cpp
+++ b/src/plugins/directshow/player/directshowmediatypelist.cpp
@@ -198,7 +198,7 @@ HRESULT DirectShowMediaTypeList::nextMediaType(
if (fetchedCount)
*fetchedCount = boundedCount;
- return boundedCount == count ? S_OK : S_FALSE;
+ return boundedCount == int(count) ? S_OK : S_FALSE;
}
}
diff --git a/src/plugins/directshow/player/videosurfacefilter.cpp b/src/plugins/directshow/player/videosurfacefilter.cpp
index 13438857f..d6e48d866 100644
--- a/src/plugins/directshow/player/videosurfacefilter.cpp
+++ b/src/plugins/directshow/player/videosurfacefilter.cpp
@@ -550,19 +550,20 @@ HRESULT VideoSurfaceFilter::cloneMediaType(int token, int index, IEnumMediaTypes
void VideoSurfaceFilter::customEvent(QEvent *event)
{
- if (event->type() == StartSurface) {
+ const int type = event->type();
+ if (type == StartSurface) {
QMutexLocker locker(&m_mutex);
m_startResult = start();
m_wait.wakeAll();
- } else if (event->type() == StopSurface) {
+ } else if (type == StopSurface) {
QMutexLocker locker(&m_mutex);
stop();
m_wait.wakeAll();
- } else if (event->type() == FlushSurface) {
+ } else if (type == FlushSurface) {
QMutexLocker locker(&m_mutex);
flush();