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_utils.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_utils.c')
| -rwxr-xr-x | audio/out/ao_wasapi_utils.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c index fdd0048ae1..fd65cc82eb 100755 --- a/audio/out/ao_wasapi_utils.c +++ b/audio/out/ao_wasapi_utils.c @@ -34,7 +34,7 @@ #include "osdep/io.h" #include "osdep/timer.h" -#define MIXER_DEFAULT_LABEL u"mpv - video player" +#define MIXER_DEFAULT_LABEL L"mpv - video player" DEFINE_PROPERTYKEY(mp_PKEY_Device_FriendlyName, 0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, @@ -190,7 +190,7 @@ bool wasapi_fill_VistaBlob(wasapi_state *state) { if (!state) goto exit_label; - state->VistaBlob.hAvrt = LoadLibraryW(u"avrt.dll"); + state->VistaBlob.hAvrt = LoadLibraryW(L"avrt.dll"); if (!state->VistaBlob.hAvrt) goto exit_label; @@ -612,7 +612,7 @@ exit_label: } static HRESULT init_session_display(struct wasapi_state *state) { - WCHAR path[MAX_PATH+12] = {0}; + wchar_t path[MAX_PATH+12] = {0}; HRESULT hr = IAudioClient_GetService(state->pAudioClient, &IID_IAudioSessionControl, @@ -620,7 +620,7 @@ static HRESULT init_session_display(struct wasapi_state *state) { EXIT_ON_ERROR(hr); GetModuleFileNameW(NULL, path, MAX_PATH); - lstrcatW(path, u",-IDI_ICON1"); + lstrcatW(path, L",-IDI_ICON1"); hr = IAudioSessionControl_SetDisplayName(state->pSessionControl, MIXER_DEFAULT_LABEL, NULL); EXIT_ON_ERROR(hr); @@ -725,7 +725,7 @@ reinit: if (state->VistaBlob.hAvrt) { state->hTask = - state->VistaBlob.pAvSetMmThreadCharacteristicsW(u"Pro Audio", &state->taskIndex); + state->VistaBlob.pAvSetMmThreadCharacteristicsW(L"Pro Audio", &state->taskIndex); } MP_VERBOSE(state, "Format fixed. Using %lld byte buffer block size\n", |