summaryrefslogtreecommitdiffstats
path: root/audio/out
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2016-01-28 00:45:38 -0800
committerKevin Mitchell <kevmitch@gmail.com>2016-01-28 00:56:03 -0800
commit4d5d25fdbbe9b559eb1600520ef33fce380030c9 (patch)
tree6836f41d35f2711f21c6bbd8f53187a07253ab34 /audio/out
parente927ff16661e7b5bd42cba2aa3f1bd3d4ac148ff (diff)
downloadmpv-4d5d25fdbbe9b559eb1600520ef33fce380030c9.tar.bz2
mpv-4d5d25fdbbe9b559eb1600520ef33fce380030c9.tar.xz
ao_wasapi: add "wasapi" prefix to non-static find_deviceID function
Diffstat (limited to 'audio/out')
-rw-r--r--audio/out/ao_wasapi.c2
-rw-r--r--audio/out/ao_wasapi.h2
-rw-r--r--audio/out/ao_wasapi_utils.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index 5c30f7394a..d84b3e0252 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -281,7 +281,7 @@ static int init(struct ao *ao)
struct wasapi_state *state = ao->priv;
state->log = ao->log;
- state->deviceID = find_deviceID(ao);
+ state->deviceID = wasapi_find_deviceID(ao);
if (!state->deviceID) {
uninit(ao);
return -1;
diff --git a/audio/out/ao_wasapi.h b/audio/out/ao_wasapi.h
index eaa056a931..c1181450a3 100644
--- a/audio/out/ao_wasapi.h
+++ b/audio/out/ao_wasapi.h
@@ -120,7 +120,7 @@ char *mp_PKEY_to_str_buf(char *buf, size_t buf_size, const PROPERTYKEY *pkey);
void wasapi_list_devs(struct ao *ao, struct ao_device_list *list);
bstr wasapi_get_specified_device_string(struct ao *ao);
-LPWSTR find_deviceID(struct ao *ao);
+LPWSTR wasapi_find_deviceID(struct ao *ao);
void wasapi_dispatch(struct ao *ao);
HRESULT wasapi_thread_init(struct ao *ao);
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
index 9ca72318ad..e3cf6fccae 100644
--- a/audio/out/ao_wasapi_utils.c
+++ b/audio/out/ao_wasapi_utils.c
@@ -867,7 +867,7 @@ bstr wasapi_get_specified_device_string(struct ao *ao)
return device;
}
-LPWSTR find_deviceID(struct ao *ao)
+LPWSTR wasapi_find_deviceID(struct ao *ao)
{
LPWSTR deviceID = NULL;
bstr device = wasapi_get_specified_device_string(ao);