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/lua.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'player/lua.c') diff --git a/player/lua.c b/player/lua.c index 84d7295640..b805a34ca8 100644 --- a/player/lua.c +++ b/player/lua.c @@ -971,7 +971,7 @@ static int script_set_osd_ass(lua_State *L) if (!text[0]) text = " "; // force external OSD initialization osd_set_external(ctx->mpctx->osd, ctx->client, res_x, res_y, (char *)text); - mp_input_wakeup(ctx->mpctx->input); + mp_wakeup_core(ctx->mpctx); return 0; } -- cgit v1.2.3