ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineoss: Avoid SNDCTL_DSP_GETTRIGGER.

This commit is contained in:
Tijl Coosemans 2007-08-08 00:19:14 +02:00 committed by Alexandre Julliard
parent 0025960917
commit 3429068f35
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/wineoss.drv/audio.c
View File

@ -389,18 +389,16 @@ static DWORD OSS_RawOpenDevice(OSS_DEVICE* ossdev, int strict_format)
} }
ossdev->fd = fd; ossdev->fd = fd;
ossdev->bOutputEnabled = TRUE; /* OSS enables by default */
ossdev->bInputEnabled = TRUE; /* OSS enables by default */
if (ossdev->open_access == O_RDONLY)
ossdev->bOutputEnabled = FALSE;
if (ossdev->open_access == O_WRONLY)
ossdev->bInputEnabled = FALSE;
if (ossdev->bTriggerSupport) { if (ossdev->bTriggerSupport) {
int trigger; int trigger;
rc = ioctl(fd, SNDCTL_DSP_GETTRIGGER, &trigger); trigger = getEnables(ossdev);
if (rc != 0) {
ERR("ioctl(%s, SNDCTL_DSP_GETTRIGGER) failed (%s)\n",
ossdev->dev_name, strerror(errno));
goto error;
}
ossdev->bOutputEnabled = ((trigger & PCM_ENABLE_OUTPUT) == PCM_ENABLE_OUTPUT);
ossdev->bInputEnabled = ((trigger & PCM_ENABLE_INPUT) == PCM_ENABLE_INPUT);
/* If we do not have full duplex, but they opened RDWR /* If we do not have full duplex, but they opened RDWR
** (as you have to in order for an mmap to succeed) ** (as you have to in order for an mmap to succeed)
** then we start out with input off ** then we start out with input off
@ -411,16 +409,8 @@ static DWORD OSS_RawOpenDevice(OSS_DEVICE* ossdev, int strict_format)
trigger &= ~PCM_ENABLE_INPUT; trigger &= ~PCM_ENABLE_INPUT;
ioctl(fd, SNDCTL_DSP_SETTRIGGER, &trigger); ioctl(fd, SNDCTL_DSP_SETTRIGGER, &trigger);
} }
} else {
ossdev->bOutputEnabled = TRUE; /* OSS enables by default */
ossdev->bInputEnabled = TRUE; /* OSS enables by default */
} }
if (ossdev->open_access == O_RDONLY)
ossdev->bOutputEnabled = FALSE;
if (ossdev->open_access == O_WRONLY)
ossdev->bInputEnabled = FALSE;
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
error: error: