diff options
author | Akemi <der.richter@gmx.de> | 2018-02-28 15:09:14 +0100 |
---|---|---|
committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-03-04 16:26:35 -0800 |
commit | a76eecdc2ca5a31125a1a1372388eb3b10fa857a (patch) | |
tree | 86d96af0370e4b1370b145f078c14583460c9d0f | |
parent | ae2972557f555a11591082c213e653ac68a01f23 (diff) | |
download | mpv-a76eecdc2ca5a31125a1a1372388eb3b10fa857a.tar.bz2 mpv-a76eecdc2ca5a31125a1a1372388eb3b10fa857a.tar.xz |
client: remove legacy API that is unused now
this API was introduced in c5e4538 solely for the use with cocoa-cb and
was not public. with the port to the new API in 760d471 it is now unused
and can safely be removed.
-rw-r--r-- | player/client.c | 34 | ||||
-rw-r--r-- | player/client.h | 11 |
2 files changed, 1 insertions, 44 deletions
diff --git a/player/client.c b/player/client.c index 45af55bee9..a8b90082cc 100644 --- a/player/client.c +++ b/player/client.c @@ -1836,39 +1836,12 @@ int mpv_opengl_cb_uninit_gl(mpv_opengl_cb_context *ctx) return 0; } -void mp_client_set_control_callback(struct mpv_opengl_cb_context *ctx, - mpv_opengl_cb_control_fn callback, - void *callback_ctx) -{ - if (ctx->client_api->render_context) { - mp_render_context_set_control_callback(ctx->client_api->render_context, - callback, callback_ctx); - } -} - -void mp_client_set_icc_profile(struct mpv_opengl_cb_context *ctx, bstr icc_data) -{ - if (!ctx->client_api->render_context) - return; - mpv_render_param param = {MPV_RENDER_PARAM_ICC_PROFILE, - &(mpv_byte_array){icc_data.start, icc_data.len}}; - mpv_render_context_set_parameter(ctx->client_api->render_context, param); -} - -void mp_client_set_ambient_lux(struct mpv_opengl_cb_context *ctx, int lux) -{ - if (!ctx->client_api->render_context) - return; - mpv_render_param param = {MPV_RENDER_PARAM_AMBIENT_LIGHT, &(int){lux}}; - mpv_render_context_set_parameter(ctx->client_api->render_context, param); -} - int mpv_opengl_cb_render(mpv_opengl_cb_context *ctx, int fbo, int vp[4]) { return mpv_opengl_cb_draw(ctx, fbo, vp[2], vp[3]); } -void *mp_get_sub_api2(mpv_handle *ctx, mpv_sub_api sub_api, bool lock) +void *mpv_get_sub_api(mpv_handle *ctx, mpv_sub_api sub_api) { if (!ctx->mpctx->initialized) return NULL; @@ -1882,11 +1855,6 @@ void *mp_get_sub_api2(mpv_handle *ctx, mpv_sub_api sub_api, bool lock) return res; } -void *mpv_get_sub_api(mpv_handle *ctx, mpv_sub_api sub_api) -{ - return mp_get_sub_api2(ctx, sub_api, true); -} - // stream_cb struct mp_custom_protocol { diff --git a/player/client.h b/player/client.h index 58e84418a2..118f6800f6 100644 --- a/player/client.h +++ b/player/client.h @@ -37,7 +37,6 @@ struct mp_log *mp_client_get_log(struct mpv_handle *ctx); struct mpv_global *mp_client_get_global(struct mpv_handle *ctx); struct MPContext *mp_client_get_core(struct mpv_handle *ctx); struct MPContext *mp_client_api_get_core(struct mp_client_api *api); -void *mp_get_sub_api2(mpv_handle *ctx, mpv_sub_api sub_api, bool lock); // m_option.c void *node_get_alloc(struct mpv_node *node); @@ -54,14 +53,4 @@ void kill_video(struct mp_client_api *client_api); bool mp_streamcb_lookup(struct mpv_global *g, const char *protocol, void **out_user_data, mpv_stream_cb_open_ro_fn *out_fn); -// Legacy. -typedef int (*mpv_opengl_cb_control_fn)(void *cb_ctx, int *events, - uint32_t request, void *data); -struct mpv_opengl_cb_context; -void mp_client_set_control_callback(struct mpv_opengl_cb_context *ctx, - mpv_opengl_cb_control_fn callback, - void *callback_ctx); -void mp_client_set_icc_profile(struct mpv_opengl_cb_context *ctx, bstr icc_data); -void mp_client_set_ambient_lux(struct mpv_opengl_cb_context *ctx, int lux); - #endif |