diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-30 11:06:55 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-30 14:46:17 +0300 |
commit | bfcb3a7a8130be478103beb1923567f5e5d86c67 (patch) | |
tree | e8a376f6cebf586fff714f1b49b83c0e695b0cdb /libvo/vo_xv.c | |
parent | 32e52b8fd0b917a40a9192770cc1a41aa31b34d0 (diff) | |
download | mpv-bfcb3a7a8130be478103beb1923567f5e5d86c67.tar.bz2 mpv-bfcb3a7a8130be478103beb1923567f5e5d86c67.tar.xz |
input: Move key filedescriptor list to context struct
The context variable is now passed to VOs too as it's now needed to
add a callback on the X filedescriptor.
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r-- | libvo/vo_xv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 29374ed0e6..01313a30bd 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -711,7 +711,7 @@ static void uninit(struct vo *vo) vo_vm_close(vo); #endif if (ctx->event_fd_registered) - mp_input_rm_key_fd(ConnectionNumber(vo->x11->display)); + mp_input_rm_key_fd(vo->input_ctx, ConnectionNumber(vo->x11->display)); // uninit() shouldn't get called unless initialization went past vo_init() vo_x11_uninit(vo); } @@ -844,8 +844,8 @@ static int preinit(struct vo *vo, const char *arg) ctx->fo = XvListImageFormats(x11->display, x11->xv_port, (int *) &ctx->formats); - mp_input_add_key_fd(ConnectionNumber(x11->display), 1, x11_fd_callback, - NULL, vo); + mp_input_add_key_fd(vo->input_ctx, ConnectionNumber(x11->display), 1, + x11_fd_callback, NULL, vo); ctx->event_fd_registered = 1; return 0; |