diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
| commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
| tree | f8ba954c698470208a243be3da216f7f54367f46 /input | |
| parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
| parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
| download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz | |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'input')
| -rw-r--r-- | input/input.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/input/input.c b/input/input.c index 9b0ad576b5..be272929a3 100644 --- a/input/input.c +++ b/input/input.c @@ -170,7 +170,7 @@ 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 HAVE_NEW_GUI +#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}} } }, @@ -185,7 +185,7 @@ static const mp_cmd_t mp_cmds[] = { { MP_CMD_DVDNAV, "dvdnav", 1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, #endif -#ifdef HAVE_MENU +#ifdef CONFIG_MENU { MP_CMD_MENU, "menu",1, { {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, { MP_CMD_SET_MENU, "set_menu",1, { {MP_CMD_ARG_STRING, {0}}, {MP_CMD_ARG_STRING, {0}}, {-1,{0}} } }, { MP_CMD_CHELP, "help", 0, { {-1,{0}} } }, @@ -491,7 +491,7 @@ static const mp_cmd_bind_t def_cmd_binds[] = { }; -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI static const mp_cmd_bind_t gui_def_cmd_binds[] = { { { 'l', 0 }, "gui_loadfile" }, @@ -1677,7 +1677,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf, int use_gui) char* file; -#ifdef HAVE_NEW_GUI +#ifdef CONFIG_GUI if(use_gui) add_binds(ictx, gui_def_cmd_binds); #endif |