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/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'player/misc.c') diff --git a/player/misc.c b/player/misc.c index 17232ff828..65aad50de7 100644 --- a/player/misc.c +++ b/player/misc.c @@ -267,7 +267,7 @@ static void *thread_wrapper(void *pctx) pthread_mutex_lock(&args->mutex); args->done = true; pthread_mutex_unlock(&args->mutex); - mp_input_wakeup(args->mpctx->input); // this interrupts mp_idle() + mp_wakeup_core(args->mpctx); // this interrupts mp_idle() return NULL; } -- cgit v1.2.3