From b8ade7c99b830ee9870040bcfc1f2c3d3a64d172 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 16 Sep 2016 14:23:54 +0200 Subject: 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). --- player/loadfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'player/loadfile.c') diff --git a/player/loadfile.c b/player/loadfile.c index ebead19e4e..e89047f0aa 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -204,7 +204,7 @@ void reselect_demux_stream(struct MPContext *mpctx, struct track *track) static void wakeup_demux(void *pctx) { struct MPContext *mpctx = pctx; - mp_input_wakeup(mpctx->input); + mp_wakeup_core(mpctx); } static void enable_demux_thread(struct MPContext *mpctx, struct demuxer *demux) -- cgit v1.2.3