diff options
| author | wm4 <wm4@nowhere> | 2015-07-28 23:59:17 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-07-29 00:01:32 +0200 |
| commit | 0b52ac8a78245793daaf533f5f8b74cb019a8aa8 (patch) | |
| tree | d4256c2440a61c367006b858d90ea766075a9630 /audio/out | |
| parent | 7d889fbdd0735aab6c0930ed23bc8b5c33ff46e7 (diff) | |
| download | mpv-0b52ac8a78245793daaf533f5f8b74cb019a8aa8.tar.bz2 mpv-0b52ac8a78245793daaf533f5f8b74cb019a8aa8.tar.xz | |
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.)
Diffstat (limited to 'audio/out')
| -rw-r--r-- | audio/out/ao_dsound.c | 2 | ||||
| -rw-r--r-- | audio/out/ao_wasapi.c | 5 | ||||
| -rwxr-xr-x | audio/out/ao_wasapi_utils.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index c581bf512e..3e950c3bab 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -174,7 +174,7 @@ static BOOL CALLBACK DirectSoundEnum(LPGUID guid, LPCSTR desc, LPCSTR module, } char *guidstr = talloc_strdup(NULL, ""); if (guid) { - wchar_t guidwstr[80] = {0}; + WCHAR guidwstr[80] = {0}; StringFromGUID2(guid, guidwstr, MP_ARRAY_SIZE(guidwstr)); char *nstr = mp_to_utf8(NULL, guidwstr); if (nstr) { 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 <endpointvolume.h> #include <mmdeviceapi.h> #include <avrt.h> +#include <windows.h> #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 diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c index fd65cc82eb..8410d0fcf5 100755 --- a/audio/out/ao_wasapi_utils.c +++ b/audio/out/ao_wasapi_utils.c @@ -612,7 +612,7 @@ exit_label: } static HRESULT init_session_display(struct wasapi_state *state) { - wchar_t path[MAX_PATH+12] = {0}; + WCHAR path[MAX_PATH+12] = {0}; HRESULT hr = IAudioClient_GetService(state->pAudioClient, &IID_IAudioSessionControl, |