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

Use triggers to disable the sound input/output side we don't care 

about when in pseudo fullduplex mode.
This commit is contained in:
Francois Gouget 2004-05-20 01:16:10 +00:00 committed by Alexandre Julliard
parent ca7ee47750
commit ceeed96a38
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dlls/winmm/wineoss/audio.c
View File

@ -392,10 +392,19 @@ static DWORD OSS_OpenDevice(OSS_DEVICE* ossdev, unsigned req_access,
int sample_rate, int stereo, int fmt) int sample_rate, int stereo, int fmt)
{ {
DWORD ret; DWORD ret;
DWORD open_access;
TRACE("(%p,%u,%p,%d,%d,%d,%x)\n",ossdev,req_access,frag,strict_format,sample_rate,stereo,fmt); TRACE("(%p,%u,%p,%d,%d,%d,%x)\n",ossdev,req_access,frag,strict_format,sample_rate,stereo,fmt);
if (ossdev->full_duplex && (req_access == O_RDONLY || req_access == O_WRONLY)) if (ossdev->full_duplex && (req_access == O_RDONLY || req_access == O_WRONLY))
req_access = O_RDWR; {
TRACE("Opening RDWR because full_duplex=%d and req_access=%d\n",
ossdev->full_duplex,req_access);
open_access = O_RDWR;
}
else
{
open_access=req_access;
}
/* FIXME: this should be protected, and it also contains a race with OSS_CloseDevice */ /* FIXME: this should be protected, and it also contains a race with OSS_CloseDevice */
if (ossdev->open_count == 0) if (ossdev->open_count == 0)
@ -406,15 +415,28 @@ static DWORD OSS_OpenDevice(OSS_DEVICE* ossdev, unsigned req_access,
ossdev->sample_rate = sample_rate; ossdev->sample_rate = sample_rate;
ossdev->stereo = stereo; ossdev->stereo = stereo;
ossdev->format = fmt; ossdev->format = fmt;
ossdev->open_access = req_access; ossdev->open_access = open_access;
ossdev->owner_tid = GetCurrentThreadId(); ossdev->owner_tid = GetCurrentThreadId();
if ((ret = OSS_RawOpenDevice(ossdev,strict_format)) != MMSYSERR_NOERROR) return ret; if ((ret = OSS_RawOpenDevice(ossdev,strict_format)) != MMSYSERR_NOERROR) return ret;
if (ossdev->full_duplex && ossdev->bTriggerSupport &&
(req_access == O_RDONLY || req_access == O_WRONLY))
{
int enable;
if (req_access == O_WRONLY)
ossdev->bInputEnabled=0;
else
ossdev->bOutputEnabled=0;
enable = getEnables(ossdev);
TRACE("Calling SNDCTL_DSP_SETTRIGGER with %x\n",enable);
if (ioctl(ossdev->fd, SNDCTL_DSP_SETTRIGGER, &enable) < 0)
ERR("ioctl(%s, SNDCTL_DSP_SETTRIGGER, %d) failed (%s)\n",ossdev->dev_name, enable, strerror(errno));
}
} }
else else
{ {
/* check we really open with the same parameters */ /* check we really open with the same parameters */
if (ossdev->open_access != req_access) if (ossdev->open_access != open_access)
{ {
ERR("FullDuplex: Mismatch in access. Your sound device is not full duplex capable.\n"); ERR("FullDuplex: Mismatch in access. Your sound device is not full duplex capable.\n");
return WAVERR_BADFORMAT; return WAVERR_BADFORMAT;
@ -446,6 +468,19 @@ static DWORD OSS_OpenDevice(OSS_DEVICE* ossdev, unsigned req_access,
WARN("Another thread is trying to access audio...\n"); WARN("Another thread is trying to access audio...\n");
return MMSYSERR_ERROR; return MMSYSERR_ERROR;
} }
if (ossdev->full_duplex && ossdev->bTriggerSupport &&
(req_access == O_RDONLY || req_access == O_WRONLY))
{
int enable;
if (req_access == O_WRONLY)
ossdev->bOutputEnabled=1;
else
ossdev->bInputEnabled=1;
enable = getEnables(ossdev);
TRACE("Calling SNDCTL_DSP_SETTRIGGER with %x\n",enable);
if (ioctl(ossdev->fd, SNDCTL_DSP_SETTRIGGER, &enable) < 0)
ERR("ioctl(%s, SNDCTL_DSP_SETTRIGGER, %d) failed (%s)\n",ossdev->dev_name, enable, strerror(errno));
}
} }
ossdev->open_count++; ossdev->open_count++;