diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2017-02-12 01:01:56 +0100 |
| commit | 35aa705c3ece8293652ffcf449c71fe80b96e722 (patch) | |
| tree | 7c0fb34ec96204cbcd867a973b2476689919a5b4 /input/input.h | |
| parent | 10a005df0c981050afc35184a42173bea7ea2527 (diff) | |
| parent | 3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff) | |
| download | mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2 mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'input/input.h')
| -rw-r--r-- | input/input.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/input/input.h b/input/input.h index 5b5edd580d..fb928e0808 100644 --- a/input/input.h +++ b/input/input.h @@ -242,8 +242,7 @@ void mp_input_wakeup(struct input_ctx *ictx); // Used to asynchronously abort playback. Needed because the core still can // block on network in some situations. -struct mp_cancel; -void mp_input_set_cancel(struct input_ctx *ictx, struct mp_cancel *cancel); +void mp_input_set_cancel(struct input_ctx *ictx, void (*cb)(void *c), void *c); // If this returns true, use Right Alt key as Alt Gr to produce special // characters. If false, count Right Alt as the modifier Alt key. |