Commit b0d53839 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

MMDevice: simplify Close in WinRT mode

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 819d233b
...@@ -821,23 +821,24 @@ static void Close(vlc_object_t *obj) ...@@ -821,23 +821,24 @@ static void Close(vlc_object_t *obj)
audio_output_t *aout = (audio_output_t *)obj; audio_output_t *aout = (audio_output_t *)obj;
aout_sys_t *sys = aout->sys; aout_sys_t *sys = aout->sys;
#if !VLC_WINSTORE_APP
EnterMTA(); /* enter MTA before thread leaves MTA */ EnterMTA(); /* enter MTA before thread leaves MTA */
if (sys->dev != NULL) if (sys->dev != NULL)
CloseDevice(aout); CloseDevice(aout);
#if !VLC_WINSTORE_APP
IMMDeviceEnumerator_Release(sys->it); IMMDeviceEnumerator_Release(sys->it);
sys->it = NULL; sys->it = NULL;
SetEvent(sys->device_changed); SetEvent(sys->device_changed);
vlc_join(sys->thread, NULL); vlc_join(sys->thread, NULL);
#endif
LeaveMTA(); LeaveMTA();
#if !VLC_WINSTORE_APP
CloseHandle(sys->device_ready); CloseHandle(sys->device_ready);
CloseHandle(sys->device_changed); CloseHandle(sys->device_changed);
#else
if (sys->dev != NULL)
CloseDevice(aout);
#endif #endif
free(sys); free(sys);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment