From 0b52ac8a78245793daaf533f5f8b74cb019a8aa8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 28 Jul 2015 23:59:17 +0200 Subject: win32: replace wchar_t with WCHAR WCHAR is more portable. While at least MinGW, Cygwin, and MSVC actually use 16 bit wchar_t, Midipix will have 32 bit wchar_t. In that context, using WCHAR instead is more portable. This affects only non-MinGW parts, so not all uses of wchar_t need to be changed. For example, terminal-win.c won't be used on Midipix at all. (Most of io.c won't either, so the search & replace here is more than necessary, but also not harmful.) (Midipix is not useable yet, so this is just preparation.) --- audio/out/ao_wasapi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'audio/out/ao_wasapi.c') diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index 81b7535c4b..48487c133f 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "audio/out/ao_wasapi.h" #include "audio/out/ao_wasapi_utils.h" @@ -344,9 +345,9 @@ static int control(struct ao *ao, enum aocontrol cmd, void *arg) return CONTROL_TRUE; case AOCONTROL_UPDATE_STREAM_TITLE: { MP_VERBOSE(state, "Updating stream title to \"%s\"\n", (char*)arg); - wchar_t *title = mp_from_utf8(NULL, (char*)arg); + WCHAR *title = mp_from_utf8(NULL, (char*)arg); - wchar_t *tmp = NULL; + WCHAR *tmp = NULL; /* There is a weird race condition in the IAudioSessionControl itself -- it seems that *sometimes* the SetDisplayName does not take effect and it still shows -- cgit v1.2.3