diff options
author | wm4 <wm4@nowhere> | 2014-04-15 22:42:15 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-04-15 22:42:15 +0200 |
commit | ad75b8e339e3a8a1aae3564695a572836228cdc5 (patch) | |
tree | 463e570f3272fbe1bbf8a236377fa25bc121ddff /audio/out | |
parent | e2184fcbfb84029666d07fd49b4cab71b835e2e8 (diff) | |
download | mpv-ad75b8e339e3a8a1aae3564695a572836228cdc5.tar.bz2 mpv-ad75b8e339e3a8a1aae3564695a572836228cdc5.tar.xz |
ao_pulse: use ao_need_data()
I'm not quite sure why ao_pulse needs this. It was broken when a thread
to fill audio buffers was added to AO - the pulseaudio callback was
waking up the playback thread, not the audio thread. But nobody noticed,
so it can't be very important. In any case, this change makes it wake up
the audio thread instead (which in turn wakes up the playback thread if
needed).
Diffstat (limited to 'audio/out')
-rw-r--r-- | audio/out/ao_pulse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index d08ffcfc53..e327643154 100644 --- a/audio/out/ao_pulse.c +++ b/audio/out/ao_pulse.c @@ -30,9 +30,9 @@ #include "config.h" #include "audio/format.h" #include "common/msg.h" +#include "options/m_option.h" #include "ao.h" #include "internal.h" -#include "input/input.h" #define PULSE_CLIENT_NAME "mpv" @@ -94,7 +94,7 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata) { struct ao *ao = userdata; struct priv *priv = ao->priv; - mp_input_wakeup(ao->input_ctx); + ao_need_data(ao); pa_threaded_mainloop_signal(priv->mainloop, 0); } |