From fb54a1436aced8462d63c1cdbb4972c05829e26f Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 13 Jul 2014 20:06:33 +0200 Subject: audio: don't wait for draining if paused Logic for this was missing from pull.c. For push.c it was missing if the driver didn't support it. But even if the driver supported it (such as with ao_alsa), strange behavior was observed by users. See issue #933. Always check explicitly whether the AO is in paused mode, and if so, don't drain. Possibly fixes #933. CC: @mpv-player/stable --- audio/out/internal.h | 1 - 1 file changed, 1 deletion(-) (limited to 'audio/out/internal.h') diff --git a/audio/out/internal.h b/audio/out/internal.h index 3d586f3848..75f5798bff 100644 --- a/audio/out/internal.h +++ b/audio/out/internal.h @@ -158,7 +158,6 @@ struct ao_driver { // These functions can be called by AOs. int ao_play_silence(struct ao *ao, int samples); -void ao_wait_drain(struct ao *ao); int ao_read_data(struct ao *ao, void **data, int samples, int64_t out_time_us); struct pollfd; int ao_wait_poll(struct ao *ao, struct pollfd *fds, int num_fds, -- cgit v1.2.3