From e4eee61a3d52fec634f781e62144109dbbefe7f0 Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sun, 15 Dec 2002 01:12:47 +0000 Subject: [PATCH] If unable to set the desired format, OSS_RawOpenDevice should call TRACE, not ERR. --- dlls/winmm/wineoss/audio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 8ab64b40b15..59553af0976 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -263,7 +263,7 @@ static DWORD OSS_RawOpenDevice(OSS_DEVICE* ossdev, int* frag) val = ossdev->format; ioctl(fd, SNDCTL_DSP_SETFMT, &val); if (val != ossdev->format) { - ERR("Can't set format to %d (returned %d)\n", val, ossdev->format); + TRACE("Can't set format to %d (returned %d)\n", ossdev->format, val); err=WAVERR_BADFORMAT; goto error; } @@ -273,7 +273,7 @@ static DWORD OSS_RawOpenDevice(OSS_DEVICE* ossdev, int* frag) val = ossdev->stereo; ioctl(fd, SNDCTL_DSP_STEREO, &val); if (val != ossdev->stereo) { - ERR("Can't set stereo to %u (returned %d)\n", val, ossdev->stereo); + TRACE("Can't set stereo to %u (returned %d)\n", ossdev->stereo, val); err=WAVERR_BADFORMAT; goto error; } @@ -281,9 +281,9 @@ static DWORD OSS_RawOpenDevice(OSS_DEVICE* ossdev, int* frag) if (ossdev->sample_rate) { val = ossdev->sample_rate; - ioctl(fd, SNDCTL_DSP_SPEED, &ossdev->sample_rate); + ioctl(fd, SNDCTL_DSP_SPEED, &val); if (!NEAR_MATCH(val, ossdev->sample_rate)) { - ERR("Can't set sample_rate to %u (returned %d)\n", val, ossdev->sample_rate); + TRACE("Can't set sample_rate to %u (returned %d)\n", ossdev->sample_rate, val); err=WAVERR_BADFORMAT; goto error; }