From e157d005ba9817f36c68df95f9e4a2f050eb5c60 Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 20 Oct 2015 00:17:54 +0200 Subject: ao_coreaudio: raise timeout for change-physical-format Reportedly fixes operation with "USB connected Parasound ZDAC v.2". (OSX and USB audio sure is not nice at all.) This might be perceived as hang by some users, so it's quite possible that this will have to be adjusted again somehow. Fixes #2409. --- audio/out/ao_coreaudio_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/out/ao_coreaudio_utils.c b/audio/out/ao_coreaudio_utils.c index 7d14b3f75c..6b60b63b05 100644 --- a/audio/out/ao_coreaudio_utils.c +++ b/audio/out/ao_coreaudio_utils.c @@ -523,7 +523,7 @@ bool ca_change_physical_format_sync(struct ao *ao, AudioStreamID stream, /* The AudioStreamSetProperty is not only asynchronous, * it is also not Atomic, in its behaviour. */ - struct timespec timeout = mp_rel_time_to_timespec(0.5); + struct timespec timeout = mp_rel_time_to_timespec(2.0); AudioStreamBasicDescription actual_format = {0}; while (1) { err = CA_GET(stream, kAudioStreamPropertyPhysicalFormat, &actual_format); -- cgit v1.2.3