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 /core/options.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 'core/options.c')
| -rw-r--r-- | core/options.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/options.c b/core/options.c index a12d041420..5e1104d3e6 100644 --- a/core/options.c +++ b/core/options.c @@ -686,7 +686,6 @@ const m_option_t mp_opts[] = { OPT_INTRANGE("key-fifo-size", input.key_fifo_size, CONF_GLOBAL, 2, 65000), OPT_FLAG("consolecontrols", consolecontrols, CONF_GLOBAL), OPT_FLAG("mouse-movements", vo.enable_mouse_movements, CONF_GLOBAL), - OPT_INTRANGE("doubleclick-time", doubleclick_time, 0, 0, 1000), #ifdef CONFIG_TV {"tvscan", (void *) tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif /* CONFIG_TV */ @@ -782,7 +781,6 @@ const struct MPOpts mp_default_opts = { .initial_audio_sync = 1, .term_osd = 2, .consolecontrols = 1, - .doubleclick_time = 300, .play_frames = -1, .keep_open = 0, .audio_id = -1, @@ -820,6 +818,7 @@ const struct MPOpts mp_default_opts = { }, .input = { .key_fifo_size = 7, + .doubleclick_time = 300, .ar_delay = 200, .ar_rate = 40, .use_joystick = 1, |