summaryrefslogtreecommitdiffstats
path: root/player/misc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-20 20:06:43 +0100
committerDiogo Franco (Kovensky) <diogomfranco@gmail.com>2015-02-21 20:49:32 +0900
commit45b63c78cd1b4dc0e78e762711f1e13ff6d97e23 (patch)
treedb77cb5412aefd3916e0e1e91bc47a1863ac77e0 /player/misc.c
parentde4727371638afb7cfb5d08bf885a1d91029ceae (diff)
downloadmpv-45b63c78cd1b4dc0e78e762711f1e13ff6d97e23.tar.bz2
mpv-45b63c78cd1b4dc0e78e762711f1e13ff6d97e23.tar.xz
player: cosmetics: async/non-blocking -> reentrant
These functions do blocking work on a separate thread, but wait until they return. So they are not async or non-blocking. But they do react to user-input and client API accesses, which makes them reentrant. (cherry picked from commit 2c305d5b2990d31911d7faa4c9117bf4eb89c88b)
Diffstat (limited to 'player/misc.c')
-rw-r--r--player/misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/player/misc.c b/player/misc.c
index 4fbef24d8e..f6696fa046 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -283,8 +283,8 @@ static void *thread_wrapper(void *pctx)
// Run the thread_fn in a new thread. Wait until the thread returns, but while
// waiting, process input and input commands.
-int mpctx_run_non_blocking(struct MPContext *mpctx, void (*thread_fn)(void *arg),
- void *thread_arg)
+int mpctx_run_reentrant(struct MPContext *mpctx, void (*thread_fn)(void *arg),
+ void *thread_arg)
{
struct wrapper_args args = {mpctx, thread_fn, thread_arg};
pthread_mutex_init(&args.mutex, NULL);