RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

ao_wasapi_changenotify: use %ls instead of %S for wchar_t 

%ls is C99. %S is supported by some systems, including MinGW/MSVC, but
no reason to use it.
This commit is contained in:
wm4 2017-04-20 07:38:03 +02:00
parent 05e6d423d9
commit 5a33242854
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/out/ao_wasapi_changenotify.c
View File

@ -67,7 +67,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceStateChanged(
case DEVICE_STATE_DISABLED: case DEVICE_STATE_DISABLED:
case DEVICE_STATE_NOTPRESENT: case DEVICE_STATE_NOTPRESENT:
case DEVICE_STATE_UNPLUGGED: case DEVICE_STATE_UNPLUGGED:
MP_VERBOSE(ao, "OnDeviceStateChanged triggered on device %S: " MP_VERBOSE(ao, "OnDeviceStateChanged triggered on device %ls: "
"requesting ao reload\n", pwstrDeviceId); "requesting ao reload\n", pwstrDeviceId);
ao_request_reload(ao); ao_request_reload(ao);
break; break;
@ -106,7 +106,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceRemoved(
MP_VERBOSE(ao, "OnDeviceRemoved triggered: sending hotplug event\n"); MP_VERBOSE(ao, "OnDeviceRemoved triggered: sending hotplug event\n");
ao_hotplug_event(ao); ao_hotplug_event(ao);
} else if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) { } else if (pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) {
MP_VERBOSE(ao, "OnDeviceRemoved triggered for device %S: " MP_VERBOSE(ao, "OnDeviceRemoved triggered for device %ls: "
"requesting ao reload\n", pwstrDeviceId); "requesting ao reload\n", pwstrDeviceId);
ao_request_reload(ao); ao_request_reload(ao);
} }
@ -166,7 +166,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnPropertyValueChanged(
if (!change->is_hotplug && pwstrDeviceId && if (!change->is_hotplug && pwstrDeviceId &&
!wcscmp(pwstrDeviceId, change->monitored)) !wcscmp(pwstrDeviceId, change->monitored))
{ {
MP_VERBOSE(ao, "OnPropertyValueChanged triggered on device %S\n", MP_VERBOSE(ao, "OnPropertyValueChanged triggered on device %ls\n",
pwstrDeviceId); pwstrDeviceId);
if (IsEqualPropertyKey(PKEY_AudioEngine_DeviceFormat, key)) { if (IsEqualPropertyKey(PKEY_AudioEngine_DeviceFormat, key)) {
MP_VERBOSE(change->ao, MP_VERBOSE(change->ao,
@ -213,7 +213,7 @@ HRESULT wasapi_change_init(struct ao *ao, bool is_hotplug)
} else { } else {
// Get the device string to compare with the pwstrDeviceId // Get the device string to compare with the pwstrDeviceId
change->monitored = state->deviceID; change->monitored = state->deviceID;
MP_VERBOSE(ao, "Monitoring changes in device %S\n", change->monitored); MP_VERBOSE(ao, "Monitoring changes in device %ls\n", change->monitored);
} }
// COM voodoo to emulate c++ class // COM voodoo to emulate c++ class