From 70a8079c8e0109eb89db3f3278be2a75a710c95e Mon Sep 17 00:00:00 2001 From: wm4 Date: Tue, 2 Jul 2013 14:00:24 +0200 Subject: core: remove mp_fifo indirection For some reason mp_fifo specifically handled double clicks, and other than that was a pointless wrapper around input.c functionality. Move the double click handling into input.c, and get rid of mp_fifo. Add some compatibility wrappers, because so much VO code uses these functions. Where struct mp_fifo is still used it's just a casted struct input_ctx. --- video/out/vo.c | 3 +-- video/out/vo.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'video') diff --git a/video/out/vo.c b/video/out/vo.c index f3af26273d..b2bf8765a8 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -285,7 +285,6 @@ static void replace_legacy_vo_name(bstr *name) } struct vo *init_best_video_out(struct mp_vo_opts *opts, - struct mp_fifo *key_fifo, struct input_ctx *input_ctx, struct encode_lavc_context *encode_lavc_ctx) { @@ -294,7 +293,7 @@ struct vo *init_best_video_out(struct mp_vo_opts *opts, struct vo *vo = talloc_ptrtype(NULL, vo); struct vo initial_values = { .opts = opts, - .key_fifo = key_fifo, + .key_fifo = (struct mp_fifo *)input_ctx, .encode_lavc_ctx = encode_lavc_ctx, .input_ctx = input_ctx, .event_fd = -1, diff --git a/video/out/vo.h b/video/out/vo.h index 9300fa37c0..611f7ec6f3 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -291,7 +291,6 @@ struct vo { }; struct vo *init_best_video_out(struct mp_vo_opts *opts, - struct mp_fifo *key_fifo, struct input_ctx *input_ctx, struct encode_lavc_context *encode_lavc_ctx); int vo_reconfig(struct vo *vo, struct mp_image_params *p, int flags); -- cgit v1.2.3