diff options
author | wm4 <wm4@nowhere> | 2020-03-26 23:39:35 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2020-03-26 23:39:35 +0100 |
commit | ca3492213035ac6299fc54803520ee9427595181 (patch) | |
tree | facd28c3badeea381b8e32dc7e0195580ffccb0e /player/client.c | |
parent | 0405b575d83ae61780db861dc68935efe6d60347 (diff) | |
download | mpv-ca3492213035ac6299fc54803520ee9427595181.tar.bz2 mpv-ca3492213035ac6299fc54803520ee9427595181.tar.xz |
client API: add a per client unique ID
I mostly intend this for internal purposes. Probably pretty useless for
external API users, but on the other hand trivial to expose. While it
makes a lot of sense internally, I'll probably regret exposing it.
Diffstat (limited to 'player/client.c')
-rw-r--r-- | player/client.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/player/client.c b/player/client.c index 648ff1173c..41645b5d95 100644 --- a/player/client.c +++ b/player/client.c @@ -77,6 +77,7 @@ struct mp_client_api { // used to safely unlock mp_client_api.lock while iterating the list of // clients. uint64_t clients_list_change_ts; + int64_t id_alloc; struct mp_custom_protocol *custom_protocols; int num_custom_protocols; @@ -111,6 +112,7 @@ struct mpv_handle { struct mp_log *log; struct MPContext *mpctx; struct mp_client_api *clients; + int64_t id; // -- not thread-safe struct mpv_event *cur_event; @@ -223,13 +225,32 @@ bool mp_clients_all_initialized(struct MPContext *mpctx) return all_ok; } +static struct mpv_handle *find_client_id(struct mp_client_api *clients, int64_t id) +{ + for (int n = 0; n < clients->num_clients; n++) { + if (clients->clients[n]->id == id) + return clients->clients[n]; + } + return NULL; +} + static struct mpv_handle *find_client(struct mp_client_api *clients, const char *name) { + if (name[0] == '@') { + char *end; + errno = 0; + long long int id = strtoll(name + 1, &end, 10); + if (errno || end[0]) + return NULL; + return find_client_id(clients, id); + } + for (int n = 0; n < clients->num_clients; n++) { if (strcmp(clients->clients[n]->name, name) == 0) return clients->clients[n]; } + return NULL; } @@ -271,6 +292,7 @@ struct mpv_handle *mp_new_client(struct mp_client_api *clients, const char *name .log = mp_log_new(client, clients->mpctx->log, nname), .mpctx = clients->mpctx, .clients = clients, + .id = ++(clients->id_alloc), .cur_event = talloc_zero(client, struct mpv_event), .events = talloc_array(client, mpv_event, num_events), .max_events = num_events, @@ -308,6 +330,11 @@ const char *mpv_client_name(mpv_handle *ctx) return ctx->name; } +int64_t mpv_client_id(mpv_handle *ctx) +{ + return ctx->id; +} + struct mp_log *mp_client_get_log(struct mpv_handle *ctx) { return ctx->log; |