diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-03 11:30:03 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-08-03 11:31:22 (GMT) |
| commit | 1f61ac3f28e8d2a765d12dea0f364cdd8082b7e1 (patch) | |
| tree | cd5e02ce4db051781be5e0b5db2edb69ef19d9a9 /src/3rdparty/phonon/ds9/qmeminputpin.cpp | |
| parent | 128717b171f01c82e5f0fb83f5923d4f7b9cfc10 (diff) | |
| download | Qt-1f61ac3f28e8d2a765d12dea0f364cdd8082b7e1.zip Qt-1f61ac3f28e8d2a765d12dea0f364cdd8082b7e1.tar.gz Qt-1f61ac3f28e8d2a765d12dea0f364cdd8082b7e1.tar.bz2 | |
Fixed warnings on phonon/ds9 with mingw (gcc 4)
Reviewed-by: Trustme
Diffstat (limited to 'src/3rdparty/phonon/ds9/qmeminputpin.cpp')
| -rw-r--r-- | src/3rdparty/phonon/ds9/qmeminputpin.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/ds9/qmeminputpin.cpp b/src/3rdparty/phonon/ds9/qmeminputpin.cpp index dca99db..865b8af 100644 --- a/src/3rdparty/phonon/ds9/qmeminputpin.cpp +++ b/src/3rdparty/phonon/ds9/qmeminputpin.cpp @@ -137,7 +137,8 @@ namespace Phonon return E_POINTER; } - if (*alloc = memoryAllocator(true)) { + *alloc = memoryAllocator(true); + if (*alloc) { return S_OK; } @@ -294,7 +295,7 @@ namespace Phonon LONG length = sample->GetActualDataLength(); HRESULT hr = alloc->Commit(); - if (hr == VFW_E_SIZENOTSET) { + if (hr == HRESULT(VFW_E_SIZENOTSET)) { ALLOCATOR_PROPERTIES prop = getDefaultAllocatorProperties(); prop.cbBuffer = qMax(prop.cbBuffer, length); ALLOCATOR_PROPERTIES actual; @@ -324,7 +325,7 @@ namespace Phonon { LONGLONG start, end; hr = sample->GetMediaTime(&start, &end); - if (hr != VFW_E_MEDIA_TIME_NOT_SET) { + if (hr != HRESULT(VFW_E_MEDIA_TIME_NOT_SET)) { hr = out->SetMediaTime(&start, &end); Q_ASSERT(SUCCEEDED(hr)); } |