diff options
| author | wm4 <wm4@nowhere> | 2015-02-20 20:06:43 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-21 20:49:32 +0900 |
| commit | 45b63c78cd1b4dc0e78e762711f1e13ff6d97e23 (patch) | |
| tree | db77cb5412aefd3916e0e1e91bc47a1863ac77e0 /player/core.h | |
| parent | de4727371638afb7cfb5d08bf885a1d91029ceae (diff) | |
| download | mpv-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/core.h')
| -rw-r--r-- | player/core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/player/core.h b/player/core.h index 98b3c7cd86..6909a2f712 100644 --- a/player/core.h +++ b/player/core.h @@ -412,8 +412,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 |