Module: wine Branch: master Commit: 50cdc6d7f3d04fafcd7b859814653be403df98e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cdc6d7f3d04fafcd7b859814...
Author: Andrew Eikum aeikum@codeweavers.com Date: Wed Dec 17 09:28:21 2014 -0600
wineoss.drv: Don't use SNDCTL_DSP_GETISPACE.
This shouldn't be needed as the device is opened in non-blocking mode, and it appears this function is unimplemented on PCBSD.
---
dlls/wineoss.drv/mmdevdrv.c | 9 --------- 1 file changed, 9 deletions(-)
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index b111338..0688f9a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1493,20 +1493,11 @@ static void oss_write_data(ACImpl *This) static void oss_read_data(ACImpl *This) { UINT64 pos, readable; - audio_buf_info bi; ssize_t nread;
- if(ioctl(This->fd, SNDCTL_DSP_GETISPACE, &bi) < 0){ - WARN("GETISPACE failed: %d (%s)\n", errno, strerror(errno)); - return; - } - pos = (This->held_frames + This->lcl_offs_frames) % This->bufsize_frames; readable = (This->bufsize_frames - pos) * This->fmt->nBlockAlign;
- if(bi.bytes < readable) - readable = bi.bytes; - nread = read(This->fd, This->local_buffer + pos * This->fmt->nBlockAlign, readable); if(nread < 0){