From 27ccad541ab4a7b1331ff60a41165ffd324c341c Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Mon, 4 Jan 2016 19:47:38 -0800 Subject: ao_wasapi: remove unnecessary header file All the wasapi files were including both ao_wasapi.h and ao_wasapi_utils.h. Just merge them into a single file. --- audio/out/ao_wasapi.h | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'audio/out/ao_wasapi.h') diff --git a/audio/out/ao_wasapi.h b/audio/out/ao_wasapi.h index d7a650c3e3..cc7f0f6e8b 100644 --- a/audio/out/ao_wasapi.h +++ b/audio/out/ao_wasapi.h @@ -20,13 +20,18 @@ #ifndef MP_AO_WASAPI_H_ #define MP_AO_WASAPI_H_ +#include #include +#include +#include #include #include -#include -#include +#include +#include "common/msg.h" #include "osdep/atomics.h" +#include "internal.h" +#include "ao.h" typedef struct change_notify { IMMNotificationClient client; // this must be first in the structure! @@ -109,4 +114,22 @@ typedef struct wasapi_state { change_notify change; } wasapi_state; +char *mp_GUID_to_str_buf(char *buf, size_t buf_size, const GUID *guid); +char *mp_PKEY_to_str_buf(char *buf, size_t buf_size, const PROPERTYKEY *pkey); +char *mp_HRESULT_to_str_buf(char *buf, size_t buf_size, HRESULT hr); +#define mp_GUID_to_str(guid) mp_GUID_to_str_buf((char[40]){0}, 40, (guid)) +#define mp_PKEY_to_str(pkey) mp_PKEY_to_str_buf((char[42]){0}, 42, (pkey)) +#define mp_HRESULT_to_str(hr) mp_HRESULT_to_str_buf((char[60]){0}, 60, (hr)) +#define mp_LastError_to_str() mp_HRESULT_to_str(HRESULT_FROM_WIN32(GetLastError())) + +void wasapi_list_devs(struct ao *ao, struct ao_device_list *list); +LPWSTR find_deviceID(struct ao *ao); + +void wasapi_dispatch(struct ao *ao); +HRESULT wasapi_thread_init(struct ao *ao); +void wasapi_thread_uninit(struct ao *ao); + +void wasapi_receive_proxies(wasapi_state *state); +void wasapi_release_proxies(wasapi_state *state); + #endif -- cgit v1.2.3