From b6c28dd26b6415181b406e1118920b13f80286b4 Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Tue, 31 Mar 2015 12:53:05 -0700 Subject: ao_wasapi: simplify hotplug Take advantage of the fact that list_devs is called with a hotplug_inited ao. Also eliminate unnecessary nested function abstraction of hotplug_(un)init and list_devs. However, keep list_devs in ao_wasapi_utils.c since it uses the private functions get_device_id, get_device_name and exposing these would require including headers for IMMDevice in ao_wasapi_utils.h. --- audio/out/ao_wasapi_utils.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'audio/out/ao_wasapi_utils.h') diff --git a/audio/out/ao_wasapi_utils.h b/audio/out/ao_wasapi_utils.h index 9806bba4a9..c0eb77388d 100755 --- a/audio/out/ao_wasapi_utils.h +++ b/audio/out/ao_wasapi_utils.h @@ -36,16 +36,12 @@ bool wasapi_fill_VistaBlob(wasapi_state *state); const char *wasapi_explain_err(const HRESULT hr); -HRESULT wasapi_enumerate_devices(struct ao *ao, - struct ao_device_list *list); +void wasapi_list_devs(struct ao *ao, struct ao_device_list *list); void wasapi_dispatch(void); HRESULT wasapi_thread_init(struct ao *ao); void wasapi_thread_uninit(struct ao *ao); -HRESULT wasapi_hotplug_init(struct ao *ao); -void wasapi_hotplug_uninit(struct ao *ao); - HRESULT wasapi_setup_proxies(wasapi_state *state); void wasapi_release_proxies(wasapi_state *state); -- cgit v1.2.3