[PATCH 06/12] winealsa: Use mmdevapi's AudioClient (2/4).

[Davide Beatrici]

From: Davide Beatrici

---
 dlls/winealsa.drv/mmdevdrv.c | 218 +++--------------------------------
 1 file changed, 15 insertions(+), 203 deletions(-)

diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c
index 8961f1a3c1d..718de9e7e64 100644
--- a/dlls/winealsa.drv/mmdevdrv.c
+++ b/dlls/winealsa.drv/mmdevdrv.c
@@ -134,20 +134,6 @@ static HRESULT alsa_stream_release(stream_handle stream, HANDLE timer_thread)
     return params.result;
 }

-static DWORD WINAPI alsa_timer_thread(void *user)
-{
-    struct timer_loop_params params;
-    ACImpl *This = user;
-
-    SetThreadDescription(GetCurrentThread(), L"winealsa_timer");
-
-    params.stream = This->stream;
-
-    ALSA_CALL(timer_loop, &params);
-
-    return 0;
-}
-
 static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name,
         GUID *guid)
 {
@@ -789,194 +775,20 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient3 *iface,
     return params.result;
 }

-static HRESULT WINAPI AudioClient_GetDevicePeriod(IAudioClient3 *iface,
-        REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct get_device_period_params params;
-
-    TRACE("(%p)->(%p, %p)\n", This, defperiod, minperiod);
-
-    if (!defperiod && !minperiod)
-        return E_POINTER;
-
-    params.device     = This->device_name;
-    params.flow       = This->dataflow;
-    params.def_period = defperiod;
-    params.min_period = minperiod;
-
-    ALSA_CALL(get_device_period, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct start_params params;
-
-    TRACE("(%p)\n", This);
-
-    sessions_lock();
-
-    if(!This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_NOT_INITIALIZED;
-    }
-
-    params.stream = This->stream;
-
-    ALSA_CALL(start, &params);
-
-    if(SUCCEEDED(params.result) && !This->timer_thread){
-        This->timer_thread = CreateThread(NULL, 0, alsa_timer_thread, This, 0, NULL);
-        SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL);
-    }
-
-    sessions_unlock();
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct stop_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-
-    ALSA_CALL(stop, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct reset_params params;
-
-    TRACE("(%p)\n", This);
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-
-    ALSA_CALL(reset, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface,
-        HANDLE event)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-    struct set_event_handle_params params;
-
-    TRACE("(%p)->(%p)\n", This, event);
-
-    if(!event)
-        return E_INVALIDARG;
-
-    if(!This->stream)
-        return AUDCLNT_E_NOT_INITIALIZED;
-
-    params.stream = This->stream;
-    params.event = event;
-
-    ALSA_CALL(set_event_handle, &params);
-
-    return params.result;
-}
-
-static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid,
-        void **ppv)
-{
-    ACImpl *This = impl_from_IAudioClient3(iface);
-
-    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv);
+extern HRESULT WINAPI client_GetDevicePeriod(IAudioClient3 *iface,
+        REFERENCE_TIME *defperiod, REFERENCE_TIME *minperiod);

-    if(!ppv)
-        return E_POINTER;
-    *ppv = NULL;
+extern HRESULT WINAPI client_Start(IAudioClient3 *iface);

-    sessions_lock();
+extern HRESULT WINAPI client_Stop(IAudioClient3 *iface);

-    if(!This->stream){
-        sessions_unlock();
-        return AUDCLNT_E_NOT_INITIALIZED;
-    }
+extern HRESULT WINAPI client_Reset(IAudioClient3 *iface);

-    if(IsEqualIID(riid, &IID_IAudioRenderClient)){
-        if(This->dataflow != eRender){
-            sessions_unlock();
-            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-        }
-        IAudioRenderClient_AddRef(&This->IAudioRenderClient_iface);
-        *ppv = &This->IAudioRenderClient_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioCaptureClient)){
-        if(This->dataflow != eCapture){
-            sessions_unlock();
-            return AUDCLNT_E_WRONG_ENDPOINT_TYPE;
-        }
-        IAudioCaptureClient_AddRef(&This->IAudioCaptureClient_iface);
-        *ppv = &This->IAudioCaptureClient_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioClock)){
-        IAudioClock_AddRef(&This->IAudioClock_iface);
-        *ppv = &This->IAudioClock_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioStreamVolume)){
-        IAudioStreamVolume_AddRef(&This->IAudioStreamVolume_iface);
-        *ppv = &This->IAudioStreamVolume_iface;
-    }else if(IsEqualIID(riid, &IID_IAudioSessionControl)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                sessions_unlock();
-                return E_OUTOFMEMORY;
-            }
-        }else
-            IAudioSessionControl2_AddRef(&This->session_wrapper->IAudioSessionControl2_iface);
-
-        *ppv = &This->session_wrapper->IAudioSessionControl2_iface;
-    }else if(IsEqualIID(riid, &IID_IChannelAudioVolume)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                sessions_unlock();
-                return E_OUTOFMEMORY;
-            }
-        }else
-            IChannelAudioVolume_AddRef(&This->session_wrapper->IChannelAudioVolume_iface);
-
-        *ppv = &This->session_wrapper->IChannelAudioVolume_iface;
-    }else if(IsEqualIID(riid, &IID_ISimpleAudioVolume)){
-        if(!This->session_wrapper){
-            This->session_wrapper = AudioSessionWrapper_Create(This);
-            if(!This->session_wrapper){
-                sessions_unlock();
-                return E_OUTOFMEMORY;
-            }
-        }else
-            ISimpleAudioVolume_AddRef(&This->session_wrapper->ISimpleAudioVolume_iface);
-
-        *ppv = &This->session_wrapper->ISimpleAudioVolume_iface;
-    }
+extern HRESULT WINAPI client_SetEventHandle(IAudioClient3 *iface,
+        HANDLE event);

-    if(*ppv){
-        sessions_unlock();
-        return S_OK;
-    }
-
-    sessions_unlock();
-
-    FIXME("stub %s\n", debugstr_guid(riid));
-    return E_NOINTERFACE;
-}
+extern HRESULT WINAPI client_GetService(IAudioClient3 *iface, REFIID riid,
+        void **ppv);

extern HRESULT WINAPI client_IsOffloadCapable(IAudioClient3 *iface,
         AUDIO_STREAM_CATEGORY category, BOOL *offload_capable);
@@ -1010,12 +822,12 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl =
     AudioClient_GetCurrentPadding,
     AudioClient_IsFormatSupported,
     AudioClient_GetMixFormat,
-    AudioClient_GetDevicePeriod,
-    AudioClient_Start,
-    AudioClient_Stop,
-    AudioClient_Reset,
-    AudioClient_SetEventHandle,
-    AudioClient_GetService,
+    client_GetDevicePeriod,
+    client_Start,
+    client_Stop,
+    client_Reset,
+    client_SetEventHandle,
+    client_GetService,
     client_IsOffloadCapable,
     client_SetClientProperties,
     client_GetBufferSizeLimits,