From 4b6f1667dbc44aebfae5de7d92ae5b8a2095c243 Mon Sep 17 00:00:00 2001 From: pontscho Date: Mon, 25 Feb 2002 13:14:27 +0000 Subject: add half new input support for gui git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4859 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 28 +++++++++++++++++++++++++--- input/input.h | 11 +++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) (limited to 'input') diff --git a/input/input.c b/input/input.c index 2c61eb5b8e..537a897f0f 100644 --- a/input/input.c +++ b/input/input.c @@ -55,6 +55,18 @@ static mp_cmd_t mp_cmds[] = { { MP_CMD_TV_STEP_CHANNEL_LIST, "tv_step_chanlist", 0, { {-1,{0}} } }, #endif { MP_CMD_VO_FULLSCREEN, "vo_fullscreen", 0, { {-1,{0}} } }, + +#ifdef HAVE_NEW_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 + { 0, NULL, 0, {} } }; @@ -137,7 +149,7 @@ static mp_cmd_bind_t def_cmd_binds[] = { { { '-', 0 }, "audio_delay -0.100" }, { { 'q', 0 }, "quit" }, { { KEY_ESC, 0 }, "quit" }, - { { 'p', 0 }, "pause" }, +// { { 'p', 0 }, "pause" }, { { ' ', 0 }, "pause" }, { { KEY_HOME, 0 }, "pt_up_step 1" }, { { KEY_END, 0 }, "pt_up_step -1" }, @@ -164,9 +176,19 @@ static mp_cmd_bind_t def_cmd_binds[] = { { { 'd', 0 }, "frame_drop" }, #ifdef USE_TV { { 'h', 0 }, "tv_step_channel 1" }, - { { 'l', 0 }, "tv_step_channel -1" }, + { { 'k', 0 }, "tv_step_channel -1" }, { { 'n', 0 }, "tv_step_norm" }, - { { 'b', 0 }, "tv_step_chanlist" }, + { { 'm', 0 }, "tv_step_chanlist" }, +#endif +#ifdef HAVE_NEW_GUI + { { 'l', 0 }, "gui_loadfile" }, + { { 't', 0 }, "gui_loadsubtitle" }, + { { 'a', 0 }, "gui_about" }, + { { KEY_ENTER, 0 }, "gui_play" }, + { { 's', 0 }, "gui_stop" }, + { { 'p', 0 }, "gui_playlist" }, + { { 'r', 0 }, "gui_preferences" }, + { { 'c', 0 }, "gui_skinbrowser" }, #endif #ifdef HAVE_JOYSTICK { { JOY_AXIS0_PLUS, 0 }, "seek 10" }, diff --git a/input/input.h b/input/input.h index 7fc30d1ee4..1591eeea9d 100644 --- a/input/input.h +++ b/input/input.h @@ -23,6 +23,17 @@ #define MP_CMD_TV_STEP_CHANNEL_LIST 19 #define MP_CMD_VO_FULLSCREEN 20 +#define MP_CMD_GUI_EVENTS 5000 +#define MP_CMD_GUI_LOADFILE 5001 +#define MP_CMD_GUI_LOADSUBTITLE 5002 +#define MP_CMD_GUI_ABOUT 5003 +#define MP_CMD_GUI_PLAY 5004 +#define MP_CMD_GUI_STOP 5005 +#define MP_CMD_GUI_PLAYLIST 5006 +#define MP_CMD_GUI_PREFERENCES 5007 +#define MP_CMD_GUI_FULLSCREEN 5008 +#define MP_CMD_GUI_SKINBROWSER 5009 + #define MP_CMD_ARG_INT 0 #define MP_CMD_ARG_FLOAT 1 #define MP_CMD_ARG_STRING 2 -- cgit v1.2.3