* modules/audio_output/waveout.c: backport of 13398.

[vlc] / modules / audio_output / waveout.c

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index af353dba93b3db56cd7f0676497d1b461800a5b3..f3b52f14e49a37f03c8ce8e507ec99e8bf071630 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -42,6 +42,10 @@
  *****************************************************************************/
 #ifdef UNDER_CE
 #   define DWORD_PTR DWORD
+#   ifdef waveOutGetDevCaps
+#       undef waveOutGetDevCaps
+        MMRESULT WINAPI waveOutGetDevCaps(UINT, LPWAVEOUTCAPS, UINT);
+#   endif
 #endif
 
 #ifndef WAVE_FORMAT_IEEE_FLOAT
@@ -296,8 +300,8 @@ static int Open( vlc_object_t *p_this )
 
         /* Check for hardware volume support */
         if( waveOutGetDevCaps( (UINT_PTR)p_aout->output.p_sys->h_waveout,
-                               &wocaps, sizeof(wocaps) == MMSYSERR_NOERROR ) &&
-            wocaps.dwSupport == WAVECAPS_VOLUME )
+                               &wocaps, sizeof(wocaps) ) == MMSYSERR_NOERROR &&
+            wocaps.dwSupport & WAVECAPS_VOLUME )
         {
             DWORD i_dummy;
             if( waveOutGetVolume( p_aout->output.p_sys->h_waveout, &i_dummy )