diff options
| author | wm4 <wm4@nowhere> | 2016-09-16 14:23:54 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-16 14:37:48 +0200 |
| commit | b8ade7c99b830ee9870040bcfc1f2c3d3a64d172 (patch) | |
| tree | 48df8031d90be4e6e1f9c9c4045a72e21c33862c /player/audio.c | |
| parent | f845f64c2abe4361084b4bc07f5f1ea5dd43ec9f (diff) | |
| download | mpv-b8ade7c99b830ee9870040bcfc1f2c3d3a64d172.tar.bz2 mpv-b8ade7c99b830ee9870040bcfc1f2c3d3a64d172.tar.xz | |
player, ao, vo: don't call mp_input_wakeup() directly
Currently, calling mp_input_wakeup() will wake up the core thread (also
called the playloop). This seems odd, but currently the core indeed
calls mp_input_wait() when it has nothing more to do. It's done this way
because MPlayer used input_ctx as central "mainloop".
This is probably going to change. Remove direct calls to this function,
and replace it with mp_wakeup_core() calls. ao and vo are changed to use
opaque callbacks and not use input_ctx for this purpose. Other code
already uses opaque callbacks, or has legitimate reasons to use
input_ctx directly (such as sending actual user input).
Diffstat (limited to 'player/audio.c')
| -rw-r--r-- | player/audio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/audio.c b/player/audio.c index 1329057033..7bcd5c87bb 100644 --- a/player/audio.c +++ b/player/audio.c @@ -397,8 +397,8 @@ static void reinit_audio_filters_and_output(struct MPContext *mpctx) mp_audio_set_channels(&afs->output, &afs->output.channels); - mpctx->ao = ao_init_best(mpctx->global, ao_flags, mpctx->input, - mpctx->encode_lavc_ctx, afs->output.rate, + mpctx->ao = ao_init_best(mpctx->global, ao_flags, mp_wakeup_core_cb, + mpctx, mpctx->encode_lavc_ctx, afs->output.rate, afs->output.format, afs->output.channels); ao_c->ao = mpctx->ao; |