summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2014-11-28 10:52:12 -0800
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-01-25 17:00:11 +0900
commitade8b6214dcaef34bb0a344a2717940c16830bbb (patch)
tree5030f456fc31cd80d5c9b253758b6ee90f11d893
parent78e957a2bdb6602cf2aeaaef956a1a32be9876a7 (diff)
downloadmpv-ade8b6214dcaef34bb0a344a2717940c16830bbb.tar.bz2
mpv-ade8b6214dcaef34bb0a344a2717940c16830bbb.tar.xz
ao/wasapi: check return values
Only issue a warning for failure of wasapi_enumerate_devices and wasapi_fill_VistaBlob.
-rw-r--r--audio/out/ao_wasapi.c9
1 files changed, 6 insertions, 3 deletions
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();
}