RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

client API: actually warn against enabling any deprecated events 

Like it was done for the "tick" event, but for all deprecated events.

Not entirely effective, since the C API enables all events by default.
This commit is contained in:
wm4 2020-03-21 14:02:53 +01:00
parent 26ac6ead91
commit 4a2fd2daf6
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
player/client.c
View File

@ -833,6 +833,18 @@ int mp_client_send_event_dup(struct MPContext *mpctx, const char *client_name,
return mp_client_send_event(mpctx, client_name, 0, event, event_data.data); return mp_client_send_event(mpctx, client_name, 0, event, event_data.data);
} }
static bool deprecated_events[] = {
[MPV_EVENT_TRACKS_CHANGED] = true,
[MPV_EVENT_TRACK_SWITCHED] = true,
[MPV_EVENT_IDLE] = true,
[MPV_EVENT_PAUSE] = true,
[MPV_EVENT_UNPAUSE] = true,
[MPV_EVENT_TICK] = true,
[MPV_EVENT_SCRIPT_INPUT_DISPATCH] = true,
[MPV_EVENT_METADATA_UPDATE] = true,
[MPV_EVENT_CHAPTER_CHANGE] = true,
};
int mpv_request_event(mpv_handle *ctx, mpv_event_id event, int enable) int mpv_request_event(mpv_handle *ctx, mpv_event_id event, int enable)
{ {
if (!mpv_event_name(event) || enable < 0 || enable > 1) if (!mpv_event_name(event) || enable < 0 || enable > 1)
@ -843,8 +855,12 @@ int mpv_request_event(mpv_handle *ctx, mpv_event_id event, int enable)
pthread_mutex_lock(&ctx->lock); pthread_mutex_lock(&ctx->lock);
uint64_t bit = 1ULL << event; uint64_t bit = 1ULL << event;
ctx->event_mask = enable ? ctx->event_mask | bit : ctx->event_mask & ~bit; ctx->event_mask = enable ? ctx->event_mask | bit : ctx->event_mask & ~bit;
if (enable && event == MPV_EVENT_TICK) if (enable && event < MP_ARRAY_SIZE(deprecated_events) &&
MP_WARN(ctx, "The 'tick' event is deprecated and will be removed.\n"); deprecated_events[event])
{
MP_WARN(ctx, "The '%s' event is deprecated and will be removed.\n",
mpv_event_name(event));
}
pthread_mutex_unlock(&ctx->lock); pthread_mutex_unlock(&ctx->lock);
return 0; return 0;
} }