diff options
| author | wm4 <wm4@nowhere> | 2015-08-01 20:51:52 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-08-01 21:09:11 +0200 |
| commit | 41101c2996262c47757bc3bbf39cc11bd7dc5f99 (patch) | |
| tree | 2add0f03bfd0a318880b9de5888f2ff264ad82d6 /audio/out/ao_wasapi.c | |
| parent | fefac2c941149fb49bcb5126060be74494d0c287 (diff) | |
| download | mpv-41101c2996262c47757bc3bbf39cc11bd7dc5f99.tar.bz2 mpv-41101c2996262c47757bc3bbf39cc11bd7dc5f99.tar.xz | |
win32: revert wchar_t changes
Revert "win32: more wchar_t -> WCHAR replacements"
Revert "win32: replace wchar_t with WCHAR"
Doing a "partial" port of this makes no sense anymore from my
perspective. Revert the changes, as they're confusing without
context, maintenance, and progress. These changes were a bit
premature anyway, and might actually cause other issues
(locale neutrality etc. as it was pointed out).
Diffstat (limited to 'audio/out/ao_wasapi.c')
| -rw-r--r-- | audio/out/ao_wasapi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index 48487c133f..81b7535c4b 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -25,7 +25,6 @@ #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" @@ -345,9 +344,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 *title = mp_from_utf8(NULL, (char*)arg); + wchar_t *title = mp_from_utf8(NULL, (char*)arg); - WCHAR *tmp = NULL; + wchar_t *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 |