From 31adc87bde5d7d671b9b52cd912875d037501a1c Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 15 Jan 2016 22:49:10 +0100 Subject: global: add client API pointer to library handle Makes the next commit simpler. It's probably a bad idea to add more fields to the global state, but on the other hand the client API state is pretty much per-instance anyway. It also will help with things like the proposed libmpv custom stream API. --- player/client.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'player/client.c') diff --git a/player/client.c b/player/client.c index f4758f653c..3abc8d8086 100644 --- a/player/client.c +++ b/player/client.c @@ -21,6 +21,7 @@ #include #include "common/common.h" +#include "common/global.h" #include "common/msg.h" #include "common/msg_control.h" #include "input/input.h" @@ -137,6 +138,7 @@ void mp_clients_init(struct MPContext *mpctx) *mpctx->clients = (struct mp_client_api) { .mpctx = mpctx, }; + mpctx->global->client_api = mpctx->clients; pthread_mutex_init(&mpctx->clients->lock, NULL); } @@ -264,6 +266,11 @@ struct MPContext *mp_client_get_core(struct mpv_handle *ctx) return ctx->mpctx; } +struct MPContext *mp_client_api_get_core(struct mp_client_api *api) +{ + return api->mpctx; +} + static void wakeup_client(struct mpv_handle *ctx) { pthread_mutex_lock(&ctx->wakeup_lock); -- cgit v1.2.3