From cb8b0cc329fa8db3590682afc8c25bb00666843c Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Tue, 29 Dec 2015 03:13:52 -0800 Subject: ao_wasapi: just use a pointer to the deviceID in change_notify Rather than creating a new string from the device instance. This will allow moving the change_init to the main thread before the device is loaded. --- audio/out/ao_wasapi_changenotify.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'audio/out') diff --git a/audio/out/ao_wasapi_changenotify.c b/audio/out/ao_wasapi_changenotify.c index acf0b45ec7..61d70161c5 100755 --- a/audio/out/ao_wasapi_changenotify.c +++ b/audio/out/ao_wasapi_changenotify.c @@ -226,8 +226,7 @@ HRESULT wasapi_change_init(struct ao *ao, bool is_hotplug) MP_DBG(ao, "Monitoring for hotplug events\n"); } else { // Get the device string to compare with the pwstrDeviceId - hr = IMMDevice_GetId(state->pDevice, &change->monitored); - EXIT_ON_ERROR(hr); + change->monitored = state->deviceID; MP_VERBOSE(ao, "Monitoring changes in device %S\n", change->monitored); } @@ -249,6 +248,5 @@ void wasapi_change_uninit(struct ao *ao) change->pEnumerator, (IMMNotificationClient *)change); } - if (change->monitored) CoTaskMemFree(change->monitored); SAFE_RELEASE(change->pEnumerator, IMMDeviceEnumerator_Release(change->pEnumerator)); } -- cgit v1.2.3