summaryrefslogtreecommitdiffstats
path: root/player/core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-20 20:06:43 +0100
committerwm4 <wm4@nowhere>2015-02-20 20:06:43 +0100
commit2c305d5b2990d31911d7faa4c9117bf4eb89c88b (patch)
tree203e90f8683ae332a51726990ca67455ab3a1cde /player/core.h
parent3c9344a1a9de335925b81058b7699fccd187626b (diff)
downloadmpv-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/core.h')
-rw-r--r--player/core.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/player/core.h b/player/core.h
index d7413dfa19..ad700cbc22 100644
--- a/player/core.h
+++ b/player/core.h
@@ -415,8 +415,8 @@ bool mp_get_cache_idle(struct MPContext *mpctx);
void update_window_title(struct MPContext *mpctx, bool force);
void error_on_track(struct MPContext *mpctx, struct track *track);
void stream_dump(struct MPContext *mpctx);
-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 mpv_global *create_sub_global(struct MPContext *mpctx);
// osd.c