diff options
author | wm4 <wm4@nowhere> | 2013-07-02 14:00:24 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-02 14:00:24 +0200 |
commit | 70a8079c8e0109eb89db3f3278be2a75a710c95e (patch) | |
tree | b96d12490af3ca5e0ed95c1952ea89d0df5ac5e7 /video/out/vo.c | |
parent | 451f6788cea2f7a90badcf2fb7e1e3679fa513cb (diff) | |
download | mpv-70a8079c8e0109eb89db3f3278be2a75a710c95e.tar.bz2 mpv-70a8079c8e0109eb89db3f3278be2a75a710c95e.tar.xz |
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.
Diffstat (limited to 'video/out/vo.c')
-rw-r--r-- | video/out/vo.c | 3 |
1 files changed, 1 insertions, 2 deletions
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, |