summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPedro Pombeiro <pedropombeiro@gmail.com>2017-06-27 14:09:26 +0200
committerwm4 <wm4@nowhere>2017-06-29 10:35:25 +0200
commitf22d12ac5115a22a251e479c9c27e5f55337bb28 (patch)
tree6deed28e5e07e6e472a7e748c5c1abc9a340ff5e
parentcd25d98bfa38c87bd857264e876cd8be42eb3678 (diff)
downloadmpv-f22d12ac5115a22a251e479c9c27e5f55337bb28.tar.bz2
mpv-f22d12ac5115a22a251e479c9c27e5f55337bb28.tar.xz
ao_wasapi: do not use deprecated wchar functions
These break on UWP. Based on a patch by Pedro Pombeiro.
-rw-r--r--audio/out/ao_wasapi.c2
-rw-r--r--audio/out/ao_wasapi_utils.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index 474528cd9c..3ddb9a113e 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -422,7 +422,7 @@ static int thread_control(struct ao *ao, enum aocontrol cmd, void *arg)
SAFE_DESTROY(tmp, CoTaskMemFree(tmp));
IAudioSessionControl_GetDisplayName(state->pSessionControl, &tmp);
- } while (lstrcmpW(title, tmp));
+ } while (wcscmp(title, tmp));
SAFE_DESTROY(tmp, CoTaskMemFree(tmp));
talloc_free(title);
return CONTROL_OK;
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c
index 1adb766644..53ab1fe036 100644
--- a/audio/out/ao_wasapi_utils.c
+++ b/audio/out/ao_wasapi_utils.c
@@ -541,7 +541,7 @@ static void init_session_display(struct wasapi_state *state) {
wchar_t path[MAX_PATH+12] = {0};
GetModuleFileNameW(NULL, path, MAX_PATH);
- lstrcatW(path, L",-IDI_ICON1");
+ wcscat(path, L",-IDI_ICON1");
hr = IAudioSessionControl_SetIconPath(state->pSessionControl, path, NULL);
if (FAILED(hr)) {
// don't goto exit_label here since SetDisplayName might still work