diff options
author | wm4 <wm4@nowhere> | 2015-02-20 20:06:43 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-02-20 20:06:43 +0100 |
commit | 2c305d5b2990d31911d7faa4c9117bf4eb89c88b (patch) | |
tree | 203e90f8683ae332a51726990ca67455ab3a1cde /player/misc.c | |
parent | 3c9344a1a9de335925b81058b7699fccd187626b (diff) | |
download | mpv-2c305d5b2990d31911d7faa4c9117bf4eb89c88b.tar.bz2 mpv-2c305d5b2990d31911d7faa4c9117bf4eb89c88b.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.
Diffstat (limited to 'player/misc.c')
-rw-r--r-- | player/misc.c | 4 |
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); |