Module: wine Branch: master Commit: acd8d60faaf00159e6c3cea76eed878df6fa6de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd8d60faaf00159e6c3cea76e...
Author: Jörg Höhle hoehle@users.sourceforge.net Date: Thu Jan 5 18:17:31 2012 +0100
mmdevapi: GetDevicePeriod returns constants.
---
dlls/winecoreaudio.drv/mmdevdrv.c | 19 ++++--------------- dlls/wineoss.drv/mmdevdrv.c | 4 ---- 2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index a2c72da..e5d2d87 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1396,21 +1396,10 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, if(!defperiod && !minperiod) return E_POINTER;
- OSSpinLockLock(&This->lock); - - if(This->period_ms){ - if(defperiod) - *defperiod = This->period_ms * 10000; - if(minperiod) - *minperiod = This->period_ms * 10000; - }else{ - if(defperiod) - *defperiod = DefaultPeriod; - if(minperiod) - *minperiod = MinimumPeriod; - } - - OSSpinLockUnlock(&This->lock); + if(defperiod) + *defperiod = DefaultPeriod; + if(minperiod) + *minperiod = MinimumPeriod;
return S_OK; } diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e80385c..304a5e1 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1261,15 +1261,11 @@ static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient *iface, if(!defperiod && !minperiod) return E_POINTER;
- EnterCriticalSection(&This->lock); - if(defperiod) *defperiod = DefaultPeriod; if(minperiod) *minperiod = MinimumPeriod;
- LeaveCriticalSection(&This->lock); - return S_OK; }