Robert Reif : winmm: Fix wave test volume warning.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu May 11 05:56:11 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: d1b838e948d85eef26b2c04d4e1071b78194acd6
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d1b838e948d85eef26b2c04d4e1071b78194acd6
Author: Robert Reif <reif at earthlink.net>
Date: Wed May 10 19:40:25 2006 -0400
winmm: Fix wave test volume warning.
Volume is only valid when sound card has volume support.
---
dlls/winmm/tests/wave.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index a0646fd..576de4f 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -553,7 +553,7 @@ static void wave_out_test_deviceOut(int
WORD nChannels = pwfx->nChannels;
WORD wBitsPerSample = pwfx->wBitsPerSample;
DWORD nSamplesPerSec = pwfx->nSamplesPerSec;
- BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME;
+ BOOL has_volume = pcaps->dwSupport & WAVECAPS_VOLUME ? TRUE : FALSE;
double paused = 0.0;
double actual;
DWORD callback = 0;
@@ -659,7 +659,7 @@ static void wave_out_test_deviceOut(int
pwfx->wBitsPerSample,pwfx->nChannels,
get_format_str(pwfx->wFormatTag),
wave_open_flags(flags));
- if (sine && !volume)
+ if (sine && has_volume && volume == 0)
trace("*** Warning the sound is muted, you will not hear the test\n");
/* Check that the position is 0 at start */
More information about the wine-cvs
mailing list