Andrew Eikum : wineoss.drv: Don' t call GETOSPACE immediately after device initialization.
Alexandre Julliard
julliard at winehq.org
Mon Feb 6 15:18:00 CST 2012
Module: wine
Branch: master
Commit: bb1ca5811458f59297f1b82205f563e0c07b5ece
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb1ca5811458f59297f1b82205f563e0c07b5ece
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Mon Feb 6 09:24:46 2012 -0600
wineoss.drv: Don't call GETOSPACE immediately after device initialization.
---
dlls/wineoss.drv/mmdevdrv.c | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
index 22ee924..35ff7d7 100644
--- a/dlls/wineoss.drv/mmdevdrv.c
+++ b/dlls/wineoss.drv/mmdevdrv.c
@@ -875,7 +875,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
{
ACImpl *This = impl_from_IAudioClient(iface);
int i;
- audio_buf_info bi;
HRESULT hr;
TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags,
@@ -955,18 +954,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
return E_OUTOFMEMORY;
}
- if(This->dataflow == eRender){
- if(ioctl(This->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){
- WARN("GETOSPACE failed: %d (%s)\n", errno, strerror(errno));
- CoTaskMemFree(This->fmt);
- This->fmt = NULL;
- LeaveCriticalSection(&This->lock);
- return E_FAIL;
- }
-
- This->oss_bufsize_bytes = bi.bytes;
- }
-
This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float));
if(!This->vols){
CoTaskMemFree(This->fmt);
@@ -980,6 +967,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface,
This->share = mode;
This->flags = flags;
+ This->oss_bufsize_bytes = 0;
EnterCriticalSection(&g_sessions_lock);
More information about the wine-cvs
mailing list