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

Fix MinGW-warnings about mismatched types.

Browse Source 
Change-Id: I6170e3aa49f5b60ba68c1ef5bb2c6c7ec6688060
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Friedemann Kleint
2013-02-14 12:09:58 +01:00
committed by The Qt Project
parent 033d5859d2
commit 4fc974fdef
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/directshow/player/directshowiosource.cpp
View File

@@ -628,7 +628,7 @@ bool DirectShowRcSource::open(const QUrl &url)
qDebug("qrc file %s", qPrintable(m_file.fileName())); qDebug("qrc file %s", qPrintable(m_file.fileName()));
if (m_file.open(QIODevice::ReadOnly)) { 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())); qDebug("Sequential %d", int(m_file.isSequential()));
setDevice(&m_file); setDevice(&m_file);

2
src/plugins/directshow/player/directshowmediatypelist.cpp
View File

@@ -198,7 +198,7 @@ HRESULT DirectShowMediaTypeList::nextMediaType(
if (fetchedCount) if (fetchedCount)
*fetchedCount = boundedCount; *fetchedCount = boundedCount;
return boundedCount == count ? S_OK : S_FALSE; return boundedCount == int(count) ? S_OK : S_FALSE;
} }
} }

7
src/plugins/directshow/player/videosurfacefilter.cpp
View File

@@ -550,19 +550,20 @@ HRESULT VideoSurfaceFilter::cloneMediaType(int token, int index, IEnumMediaTypes
void VideoSurfaceFilter::customEvent(QEvent *event) void VideoSurfaceFilter::customEvent(QEvent *event)
{ {
if (event->type() == StartSurface) { const int type = event->type();
if (type == StartSurface) {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
m_startResult = start(); m_startResult = start();
m_wait.wakeAll(); m_wait.wakeAll();
} else if (event->type() == StopSurface) { } else if (type == StopSurface) {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
stop(); stop();
m_wait.wakeAll(); m_wait.wakeAll();
} else if (event->type() == FlushSurface) { } else if (type == FlushSurface) {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
flush(); flush();