diff options
author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-01-18 07:27:03 +0100 |
---|---|---|
committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-01-18 07:27:03 +0100 |
commit | ba9b2f1e49732d597009ba514b0132a50562cd10 (patch) | |
tree | fa05f5feb181823ac9d3b5682a835ff825de6914 /audio/out/ao_wasapi_utils.h | |
parent | e1993d5ad2bdf3dd4c26474aaa2370cbc9c1cd1b (diff) | |
parent | 7b4ccb3e9f58a0745b58e473ee6e60b381242813 (diff) | |
download | mpv-ba9b2f1e49732d597009ba514b0132a50562cd10.tar.bz2 mpv-ba9b2f1e49732d597009ba514b0132a50562cd10.tar.xz |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/out/ao_wasapi_utils.h')
-rwxr-xr-x | audio/out/ao_wasapi_utils.h | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/audio/out/ao_wasapi_utils.h b/audio/out/ao_wasapi_utils.h deleted file mode 100755 index deaffd77e4..0000000000 --- a/audio/out/ao_wasapi_utils.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of mpv. - * - * Original author: Jonathan Yong <10walls@gmail.com> - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef MP_AO_WASAPI_UTILS_H_ -#define MP_AO_WASAPI_UTILS_H_ - -#include "audio/out/ao_wasapi.h" - -#include "options/m_option.h" -#include "common/msg.h" -#include "ao.h" -#include "internal.h" - -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())) - -bool wasapi_fill_VistaBlob(wasapi_state *state); - -void wasapi_list_devs(struct ao *ao, struct ao_device_list *list); - -void wasapi_dispatch(struct ao *ao); -HRESULT wasapi_thread_init(struct ao *ao); -void wasapi_thread_uninit(struct ao *ao); - -HRESULT wasapi_setup_proxies(wasapi_state *state); -void wasapi_release_proxies(wasapi_state *state); - -#endif |