diff options
author | wm4 <wm4@nowhere> | 2014-06-07 20:25:48 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-06-07 20:25:48 +0200 |
commit | fca608ccb95e4167e1885483dfd30ba71007cbb4 (patch) | |
tree | 92692bcc28a9302c7f84aaeb300bca9b6e522c0e /player/client.c | |
parent | 0b9468f65f6014b888cdb1c5c473569ca8d9c57f (diff) | |
download | mpv-fca608ccb95e4167e1885483dfd30ba71007cbb4.tar.bz2 mpv-fca608ccb95e4167e1885483dfd30ba71007cbb4.tar.xz |
client API: rename mpv_destroy() to mpv_detach_destroy()
A bit verbose, but less misleading. In most cases, the API user probably
actually wants mpv_terminate_destroy() instead, so the less-useful
function shouldn't have a simnpler name anyway.
Diffstat (limited to 'player/client.c')
-rw-r--r-- | player/client.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/player/client.c b/player/client.c index 9a984052b1..fcee36a383 100644 --- a/player/client.c +++ b/player/client.c @@ -255,7 +255,7 @@ static void unlock_core(mpv_handle *ctx) mp_dispatch_unlock(ctx->mpctx->dispatch); } -void mpv_destroy(mpv_handle *ctx) +void mpv_detach_destroy(mpv_handle *ctx) { if (!ctx) return; @@ -292,7 +292,6 @@ void mpv_destroy(mpv_handle *ctx) // shutdown_clients() sleeps to avoid wasting CPU if (clients->mpctx->input) mp_input_wakeup(clients->mpctx->input); - // TODO: make core quit if there are no clients break; } } @@ -310,7 +309,7 @@ void mpv_terminate_destroy(mpv_handle *ctx) mpv_command(ctx, (const char*[]){"quit", NULL}); if (!ctx->owner) { - mpv_destroy(ctx); + mpv_detach_destroy(ctx); return; } @@ -322,7 +321,7 @@ void mpv_terminate_destroy(mpv_handle *ctx) pthread_t playthread; mp_dispatch_run(ctx->mpctx->dispatch, get_thread, &playthread); - mpv_destroy(ctx); + mpv_detach_destroy(ctx); // And this is also the reason why we only allow 1 thread (the owner) to // call this function. |