system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 14:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

OSS_RawOpenDevice should return an error if the format is not

Browse source 
supported.
This commit is contained in:
Francois Gouget 2002-11-04 22:39:19 +00:00 committed by Alexandre Julliard
parent 1cd8154045
commit ffd98e9c59
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
dlls/winmm/wineoss/audio.c
View file

@ -240,7 +240,7 @@ static const char *wodPlayerCmdString[] = {
*/ */
static DWORD OSS_RawOpenDevice(OSS_DEVICE* ossdev, int* frag) static DWORD OSS_RawOpenDevice(OSS_DEVICE* ossdev, int* frag)
{ {
int fd, val; int fd, val, err;
if ((fd = open(ossdev->dev_name, ossdev->open_access|O_NDELAY, 0)) == -1) if ((fd = open(ossdev->dev_name, ossdev->open_access|O_NDELAY, 0)) == -1)
{ {
@ -262,25 +262,38 @@ static DWORD OSS_RawOpenDevice(OSS_DEVICE* ossdev, int* frag)
{ {
val = ossdev->format; val = ossdev->format;
ioctl(fd, SNDCTL_DSP_SETFMT, &val); ioctl(fd, SNDCTL_DSP_SETFMT, &val);
if (val != ossdev->format) if (val != ossdev->format) {
ERR("Can't set format to %d (%d)\n", ossdev->format, val); ERR("Can't set format to %d (returned %d)\n", val, ossdev->format);
err=WAVERR_BADFORMAT;
goto error;
}
} }
if (ossdev->stereo) if (ossdev->stereo)
{ {
val = ossdev->stereo; val = ossdev->stereo;
ioctl(fd, SNDCTL_DSP_STEREO, &val); ioctl(fd, SNDCTL_DSP_STEREO, &val);
if (val != ossdev->stereo) if (val != ossdev->stereo) {
ERR("Can't set stereo to %u (%d)\n", ossdev->stereo, val); ERR("Can't set stereo to %u (returned %d)\n", val, ossdev->stereo);
err=WAVERR_BADFORMAT;
goto error;
}
} }
if (ossdev->sample_rate) if (ossdev->sample_rate)
{ {
val = ossdev->sample_rate; val = ossdev->sample_rate;
ioctl(fd, SNDCTL_DSP_SPEED, &ossdev->sample_rate); ioctl(fd, SNDCTL_DSP_SPEED, &ossdev->sample_rate);
if (!NEAR_MATCH(val, ossdev->sample_rate)) if (!NEAR_MATCH(val, ossdev->sample_rate)) {
ERR("Can't set sample_rate to %u (%d)\n", ossdev->sample_rate, val); ERR("Can't set sample_rate to %u (returned %d)\n", val, ossdev->sample_rate);
err=WAVERR_BADFORMAT;
goto error;
}
} }
ossdev->fd = fd; ossdev->fd = fd;
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
error:
close(fd);
return err;
} }
/****************************************************************** /******************************************************************