Mercurial > mplayer.hg

comparison input/input.c @ 27343:5fe6a8adf569

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename two GUI-related preprocessor directives: HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2
author diego
date Wed, 30 Jul 2008 13:44:59 +0000
parents e7c989f7a7c9
children b597fd2924b4
comparison
equal deleted inserted replaced
27342:3a174cb28d36 27343:5fe6a8adf569
157 #ifdef HAVE_TV_TELETEXT 157 #ifdef HAVE_TV_TELETEXT
158 { MP_CMD_TV_TELETEXT_ADD_DEC, "teletext_add_dec", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } }, 158 { MP_CMD_TV_TELETEXT_ADD_DEC, "teletext_add_dec", 1, { {MP_CMD_ARG_STRING,{0}}, {-1,{0}} } },
159 { MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } }, 159 { MP_CMD_TV_TELETEXT_GO_LINK, "teletext_go_link", 1, { {MP_CMD_ARG_INT,{0}}, {-1,{0}} } },
160 #endif 160 #endif
161 161
162 #ifdef HAVE_NEW_GUI 162 #ifdef CONFIG_GUI
163 { MP_CMD_GUI_LOADFILE, "gui_loadfile", 0, { {-1,{0}} } }, 163 { MP_CMD_GUI_LOADFILE, "gui_loadfile", 0, { {-1,{0}} } },
164 { MP_CMD_GUI_LOADSUBTITLE, "gui_loadsubtitle", 0, { {-1,{0}} } }, 164 { MP_CMD_GUI_LOADSUBTITLE, "gui_loadsubtitle", 0, { {-1,{0}} } },
165 { MP_CMD_GUI_ABOUT, "gui_about", 0, { {-1,{0}} } }, 165 { MP_CMD_GUI_ABOUT, "gui_about", 0, { {-1,{0}} } },
166 { MP_CMD_GUI_PLAY, "gui_play", 0, { {-1,{0}} } }, 166 { MP_CMD_GUI_PLAY, "gui_play", 0, { {-1,{0}} } },
167 { MP_CMD_GUI_STOP, "gui_stop", 0, { {-1,{0}} } }, 167 { MP_CMD_GUI_STOP, "gui_stop", 0, { {-1,{0}} } },
478 478
479 { { 0 }, NULL } 479 { { 0 }, NULL }
480 }; 480 };
481 481
482 482
483 #ifdef HAVE_NEW_GUI 483 #ifdef CONFIG_GUI
484 static const mp_cmd_bind_t gui_def_cmd_binds[] = { 484 static const mp_cmd_bind_t gui_def_cmd_binds[] = {
485 485
486 { { 'l', 0 }, "gui_loadfile" }, 486 { { 'l', 0 }, "gui_loadfile" },
487 { { 't', 0 }, "gui_loadsubtitle" }, 487 { { 't', 0 }, "gui_loadsubtitle" },
488 { { KEY_ENTER, 0 }, "gui_play" }, 488 { { KEY_ENTER, 0 }, "gui_play" },
1703 1703
1704 void 1704 void
1705 mp_input_init(int use_gui) { 1705 mp_input_init(int use_gui) {
1706 char* file; 1706 char* file;
1707 1707
1708 #ifdef HAVE_NEW_GUI 1708 #ifdef CONFIG_GUI
1709 if(use_gui) 1709 if(use_gui)
1710 mp_input_add_binds(gui_def_cmd_binds); 1710 mp_input_add_binds(gui_def_cmd_binds);
1711 #endif 1711 #endif
1712 1712
1713 file = config_file[0] != '/' ? get_path(config_file) : config_file; 1713 file = config_file[0] != '/' ? get_path(config_file) : config_file;