diff options
Diffstat (limited to 'audio')
| -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, |