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

DirectShow: Fix MinGW warnings about signedness of comparison.

Browse Source 
Use a switch on int instead of else if.

common\evr\evrcustompresenter.cpp: In member function 'virtual bool EVRCustomPresenter::event(QEvent*)':
common\evr\evrcustompresenter.cpp:1882:22: warning: comparison between 'enum QEvent::Type' and 'enum EVRCustomPresenter::PresenterEvents' [-Wenum-compare]
     if (e->type() == StartSurface) {
                      ^
common\evr\evrcustompresenter.cpp:1885:29: warning: comparison between 'enum QEvent::Type' and 'enum EVRCustomPresenter::PresenterEvents' [-Wenum-compare]
     } else if (e->type() == StopSurface) {
                             ^
common\evr\evrcustompresenter.cpp:1888:29: warning: comparison between 'enum QEvent::Type' and 'enum EVRCustomPresenter::PresenterEvents' [-Wenum-compare]
     } else if (e->type() == PresentSample) {

Change-Id: I8533e2c6d9b0a01b7b95e1d8bb119b50d4aabd25
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
This commit is contained in:
Friedemann Kleint
2016-03-18 16:23:35 +01:00
parent d48fbf286b
commit 71a6b1b620
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/common/evr/evrcustompresenter.cpp
View File

@@ -1872,18 +1872,19 @@ float EVRCustomPresenter::getMaxRate(bool thin)
bool EVRCustomPresenter::event(QEvent *e)
{
if (e->type() == StartSurface) {
switch (int(e->type())) {
case StartSurface:
startSurface();
return true;
} else if (e->type() == StopSurface) {
case StopSurface:
stopSurface();
return true;
} else if (e->type() == PresentSample) {
PresentSampleEvent *ev = static_cast<PresentSampleEvent *>(e);
presentSample(ev->sample());
case PresentSample:
presentSample(static_cast<PresentSampleEvent *>(e)->sample());
return true;
default:
break;
}
return QObject::event(e);
}