summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-03-05 09:43:50 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-03-05 09:44:38 (GMT)
commit4152244217ab7f34e67f7800cb796d8923061f49 (patch)
tree98bf316799b08ff2d6fbe06954b0f232120cafb1
parent34329f2f7b535cb0904279203ac1c06efb958651 (diff)
downloadQt-4152244217ab7f34e67f7800cb796d8923061f49.zip
Qt-4152244217ab7f34e67f7800cb796d8923061f49.tar.gz
Qt-4152244217ab7f34e67f7800cb796d8923061f49.tar.bz2
Fixa few warnings on mingw
-rw-r--r--examples/multimedia/audioinput/audioinput.cpp6
-rw-r--r--src/3rdparty/phonon/ds9/backendnode.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index b01a396..af72385 100644
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -76,6 +76,8 @@ AudioInfo::AudioInfo(const QAudioFormat &format, QObject *parent)
case QAudioFormat::SignedInt:
m_maxAmplitude = 127;
break;
+ default:
+ break;
}
break;
case 16:
@@ -86,8 +88,12 @@ AudioInfo::AudioInfo(const QAudioFormat &format, QObject *parent)
case QAudioFormat::SignedInt:
m_maxAmplitude = 32767;
break;
+ default:
+ break;
}
break;
+ default:
+ break;
}
}
diff --git a/src/3rdparty/phonon/ds9/backendnode.cpp b/src/3rdparty/phonon/ds9/backendnode.cpp
index 3afcafa..737ab7b 100644
--- a/src/3rdparty/phonon/ds9/backendnode.cpp
+++ b/src/3rdparty/phonon/ds9/backendnode.cpp
@@ -67,7 +67,7 @@ namespace Phonon
if (info.pGraph) {
HRESULT hr = info.pGraph->RemoveFilter(filter);
- if (hr == VFW_E_NOT_STOPPED && m_mediaObject) {
+ if (FAILED(hr) && m_mediaObject) {
m_mediaObject->ensureStopped();
hr = info.pGraph->RemoveFilter(filter);