From 7b5baf3b53518b47be7c980829404229618eec22 Mon Sep 17 00:00:00 2001 From: Kevin Mitchell Date: Fri, 28 Nov 2014 10:52:12 -0800 Subject: ao/wasapi: check return values Only issue a warning for failure of wasapi_enumerate_devices and wasapi_fill_VistaBlob. --- audio/out/ao_wasapi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'audio/out/ao_wasapi.c') diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index 666cda557e..c092508431 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -207,10 +207,12 @@ static int init(struct ao *ao) } struct wasapi_state *state = (struct wasapi_state *)ao->priv; state->log = ao->log; - wasapi_fill_VistaBlob(state); + if(!wasapi_fill_VistaBlob(state)) + MP_WARN(ao, "Error loading thread priority functions\n"); if (state->opt_list) { - wasapi_enumerate_devices(state->log, NULL, NULL); + if(!wasapi_enumerate_devices(state->log, NULL, NULL)) + MP_WARN(ao, "Error enumerating devices\n"); } if (state->opt_exclusive) { @@ -354,7 +356,8 @@ static void audio_resume(struct ao *ao) static void list_devs(struct ao *ao, struct ao_device_list *list) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - wasapi_enumerate_devices(mp_null_log, ao, list); + if(!wasapi_enumerate_devices(mp_null_log, ao, list)) + MP_WARN(ao, "Error enumerating devices\n"); CoUninitialize(); } -- cgit v1.2.3