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_changenotify.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_changenotify.c')
-rwxr-xr-x | audio/out/ao_wasapi_changenotify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/out/ao_wasapi_changenotify.c b/audio/out/ao_wasapi_changenotify.c index 41a93f6593..1521578b19 100755 --- a/audio/out/ao_wasapi_changenotify.c +++ b/audio/out/ao_wasapi_changenotify.c @@ -67,7 +67,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceStateChanged( if (change->is_hotplug) { MP_VERBOSE(ao, "OnDeviceStateChanged triggered: sending hotplug event\n"); ao_hotplug_event(ao); - } else if (pwstrDeviceId && !lstrcmpW(pwstrDeviceId, change->monitored)) { + } else if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) { switch (dwNewState) { case DEVICE_STATE_DISABLED: case DEVICE_STATE_NOTPRESENT: @@ -110,7 +110,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceRemoved( if (change->is_hotplug) { MP_VERBOSE(ao, "OnDeviceRemoved triggered: sending hotplug event\n"); ao_hotplug_event(ao); - } else if (pwstrDeviceId && !lstrcmpW(pwstrDeviceId, change->monitored)) { + } else if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) { MP_VERBOSE(ao, "OnDeviceRemoved triggered for device %S: " "requesting ao reload\n", pwstrDeviceId); ao_request_reload(ao); @@ -144,7 +144,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDefaultDeviceChanged( } /* don't reload if already on the new default */ - if (pwstrDeviceId && !lstrcmpW(pwstrDeviceId, change->monitored)) { + if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) { MP_VERBOSE(ao, "OnDefaultDeviceChanged triggered: " "already using default device, no reload required\n"); return S_OK; @@ -167,7 +167,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnPropertyValueChanged( struct ao *ao = change->ao; if (!change->is_hotplug && pwstrDeviceId && - !lstrcmpW(pwstrDeviceId, change->monitored)) + !wcscmp(pwstrDeviceId, change->monitored)) { MP_VERBOSE(ao, "OnPropertyValueChanged triggered on device %S\n", pwstrDeviceId); |