From 5a33242854e2f2cb5fb2f5a2395998d0b5b147f0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 20 Apr 2017 07:38:03 +0200 Subject: 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. --- audio/out/ao_wasapi_changenotify.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/audio/out/ao_wasapi_changenotify.c b/audio/out/ao_wasapi_changenotify.c index dc529b638d..f0e1895305 100644 --- a/audio/out/ao_wasapi_changenotify.c +++ b/audio/out/ao_wasapi_changenotify.c @@ -67,7 +67,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceStateChanged( case DEVICE_STATE_DISABLED: case DEVICE_STATE_NOTPRESENT: 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); ao_request_reload(ao); break; @@ -106,7 +106,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnDeviceRemoved( MP_VERBOSE(ao, "OnDeviceRemoved triggered: sending hotplug event\n"); ao_hotplug_event(ao); } 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); ao_request_reload(ao); } @@ -166,7 +166,7 @@ static HRESULT STDMETHODCALLTYPE sIMMNotificationClient_OnPropertyValueChanged( if (!change->is_hotplug && pwstrDeviceId && !wcscmp(pwstrDeviceId, change->monitored)) { - MP_VERBOSE(ao, "OnPropertyValueChanged triggered on device %S\n", + MP_VERBOSE(ao, "OnPropertyValueChanged triggered on device %ls\n", pwstrDeviceId); if (IsEqualPropertyKey(PKEY_AudioEngine_DeviceFormat, key)) { MP_VERBOSE(change->ao, @@ -213,7 +213,7 @@ HRESULT wasapi_change_init(struct ao *ao, bool is_hotplug) } else { // Get the device string to compare with the pwstrDeviceId 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 -- cgit v1.2.3