diff options
author | Kevin Mitchell <kevmitch@gmail.com> | 2017-07-29 13:31:25 -0700 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2017-08-07 14:33:03 -0700 |
commit | 6f40c211a50b6c39f17e28bef8478a84853b5c13 (patch) | |
tree | c7ab9b49ca928502a29c112a71465bfe36c9475c /audio/out/ao_wasapi.h | |
parent | 434d3d4976ae279d7cb143dd1c7a32f7dd483e48 (diff) | |
download | mpv-6f40c211a50b6c39f17e28bef8478a84853b5c13.tar.bz2 mpv-6f40c211a50b6c39f17e28bef8478a84853b5c13.tar.xz |
ao_wasapi: reorganize wasapi.h
Remove dead declarations. Move macro only used in wasapi_utils.c closer to use.
Rearrange declaration order.
Diffstat (limited to 'audio/out/ao_wasapi.h')
-rw-r--r-- | audio/out/ao_wasapi.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/audio/out/ao_wasapi.h b/audio/out/ao_wasapi.h index 82fa4eb419..3cf91f5418 100644 --- a/audio/out/ao_wasapi.h +++ b/audio/out/ao_wasapi.h @@ -45,15 +45,6 @@ typedef struct change_notify { HRESULT wasapi_change_init(struct ao* ao, bool is_hotplug); void wasapi_change_uninit(struct ao* ao); -#define EXIT_ON_ERROR(hres) \ - do { if (FAILED(hres)) { goto exit_label; } } while(0) -#define SAFE_DESTROY(unk, release) \ - do { if ((unk) != NULL) { release; (unk) = NULL; } } while(0) - -#define mp_format_res_str(hres) \ - (SUCCEEDED(hres) ? "ok" : ((hres) == AUDCLNT_E_UNSUPPORTED_FORMAT) \ - ? "unsupported" : mp_HRESULT_to_str(hres)) - enum wasapi_thread_state { WASAPI_THREAD_FEED = 0, WASAPI_THREAD_RESUME, @@ -113,11 +104,12 @@ void wasapi_list_devs(struct ao *ao, struct ao_device_list *list); bstr wasapi_get_specified_device_string(struct ao *ao); LPWSTR wasapi_find_deviceID(struct ao *ao); -void wasapi_dispatch(struct ao *ao); bool 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); +#define EXIT_ON_ERROR(hres) \ + do { if (FAILED(hres)) { goto exit_label; } } while(0) +#define SAFE_DESTROY(unk, release) \ + do { if ((unk) != NULL) { release; (unk) = NULL; } } while(0) #endif |