diff options
Diffstat (limited to 'input')
-rw-r--r-- | input/input.c | 34 | ||||
-rw-r--r-- | input/input.h | 14 |
2 files changed, 2 insertions, 46 deletions
diff --git a/input/input.c b/input/input.c index 71d378057e..b45f94605b 100644 --- a/input/input.c +++ b/input/input.c @@ -189,17 +189,6 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, #endif -#ifdef CONFIG_GUI - { MP_CMD_GUI_LOADFILE, "gui_loadfile", 0, { {-1,{0}} } }, - { MP_CMD_GUI_LOADSUBTITLE, "gui_loadsubtitle", 0, { {-1,{0}} } }, - { MP_CMD_GUI_ABOUT, "gui_about", 0, { {-1,{0}} } }, - { MP_CMD_GUI_PLAY, "gui_play", 0, { {-1,{0}} } }, - { MP_CMD_GUI_STOP, "gui_stop", 0, { {-1,{0}} } }, - { MP_CMD_GUI_PLAYLIST, "gui_playlist", 0, { {-1,{0}} } }, - { MP_CMD_GUI_PREFERENCES, "gui_preferences", 0, { {-1,{0}} } }, - { MP_CMD_GUI_SKINBROWSER, "gui_skinbrowser", 0, { {-1,{0}} } }, -#endif - #ifdef CONFIG_DVDNAV { MP_CMD_DVDNAV, "dvdnav", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, #endif @@ -510,21 +499,6 @@ static const mp_cmd_bind_t def_cmd_binds[] = { }; -#ifdef CONFIG_GUI -static const mp_cmd_bind_t gui_def_cmd_binds[] = { - - { { 'l', 0 }, "gui_loadfile" }, - { { 't', 0 }, "gui_loadsubtitle" }, - { { KEY_ENTER, 0 }, "gui_play" }, - { { KEY_ESC, 0 }, "gui_stop" }, - { { 'p', 0 }, "gui_playlist" }, - { { 'r', 0 }, "gui_preferences" }, - { { 'c', 0 }, "gui_skinbrowser" }, - - { { 0 }, NULL } -}; -#endif - #ifndef MP_MAX_KEY_FD #define MP_MAX_KEY_FD 10 #endif @@ -1691,7 +1665,7 @@ char *mp_input_get_section(struct input_ctx *ictx) return ictx->section; } -struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui) +struct input_ctx *mp_input_init(struct input_conf *input_conf) { struct input_ctx *ictx = talloc_ptrtype(NULL, ictx); *ictx = (struct input_ctx){ @@ -1702,12 +1676,6 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui) }; char* file; - -#ifdef CONFIG_GUI - if(use_gui) - add_binds(ictx, gui_def_cmd_binds); -#endif - char *config_file = input_conf->config_file; file = config_file[0] != '/' ? get_path(config_file) : config_file; if(!file) diff --git a/input/input.h b/input/input.h index 69ed394ff2..3a73d4d568 100644 --- a/input/input.h +++ b/input/input.h @@ -140,18 +140,6 @@ typedef enum { MP_CMD_DVDNAV_PREVMENU, MP_CMD_DVDNAV_MOUSECLICK, - /// GUI commands - MP_CMD_GUI_EVENTS = 5000, - MP_CMD_GUI_LOADFILE, - MP_CMD_GUI_LOADSUBTITLE, - MP_CMD_GUI_ABOUT, - MP_CMD_GUI_PLAY, - MP_CMD_GUI_STOP, - MP_CMD_GUI_PLAYLIST, - MP_CMD_GUI_PREFERENCES, - MP_CMD_GUI_FULLSCREEN, - MP_CMD_GUI_SKINBROWSER, - /// DVB commands MP_CMD_DVB_SET_CHANNEL = 5101, @@ -297,7 +285,7 @@ char *mp_input_get_section(struct input_ctx *ictx); // When you create a new driver you should add it in these 2 functions. struct input_conf; -struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui); +struct input_ctx *mp_input_init(struct input_conf *input_conf); void mp_input_uninit(struct input_ctx *ictx); |