diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-04-11 17:42:55 +0200 |
| commit | 0803f4ad21c195519209bae8d18840dd810191f8 (patch) | |
| tree | f9a869011ba90c106cf5c05c3e346912a669f63a /input/input.h | |
| parent | 9d2980dab752280468620df49cabe7f4843f0551 (diff) | |
| parent | b968d779afb9114694976792e903b0591a71a816 (diff) | |
| download | mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.bz2 mpv-0803f4ad21c195519209bae8d18840dd810191f8.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'input/input.h')
| -rw-r--r-- | input/input.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/input/input.h b/input/input.h index 41432eb54d..a5710b6065 100644 --- a/input/input.h +++ b/input/input.h @@ -257,4 +257,13 @@ struct mp_ipc_ctx *mp_init_ipc(struct mp_client_api *client_api, struct mpv_global *global); void mp_uninit_ipc(struct mp_ipc_ctx *ctx); +// Serialize the given mpv_event structure to JSON. Returns an allocated string. +struct mpv_event; +char *mp_json_encode_event(struct mpv_event *event); + +// Given the raw IPC input buffer "buf", remove the first newline-separated +// command, execute it and return the result (if any) as an allocated string. +struct mpv_handle; +char *mp_ipc_consume_next_command(struct mpv_handle *client, void *ctx, bstr *buf); + #endif /* MPLAYER_INPUT_H */ |