diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /libmenu/menu_pt.c | |
parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'libmenu/menu_pt.c')
-rw-r--r-- | libmenu/menu_pt.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/libmenu/menu_pt.c b/libmenu/menu_pt.c index 1728c251a9..8540410a70 100644 --- a/libmenu/menu_pt.c +++ b/libmenu/menu_pt.c @@ -32,11 +32,13 @@ struct list_entry_s { struct menu_priv_s { menu_list_priv_t p; char* title; + int auto_close; }; static struct menu_priv_s cfg_dflt = { MENU_LIST_PRIV_DFLT, - "Jump to" + "Jump to", + 0 }; #define ST_OFF(m) M_ST_OFF(struct menu_priv_s,m) @@ -44,6 +46,7 @@ static struct menu_priv_s cfg_dflt = { static m_option_t cfg_fields[] = { MENU_LIST_PRIV_FIELDS, { "title", ST_OFF(title), CONF_TYPE_STRING, 0, 0, 0, NULL }, + { "auto-close", ST_OFF(auto_close), CONF_TYPE_FLAG, 0, 0, 1, NULL }, { NULL, NULL, NULL, 0,0,0,NULL } }; @@ -85,8 +88,11 @@ static void read_cmd(menu_t* menu,int cmd) { snprintf(str,15,"pt_step %d",d); } c = mp_input_parse_cmd(str); - if(c) - mp_input_queue_cmd(menu->input_ctx, c); + if(c) { + if(mpriv->auto_close) + mp_input_queue_cmd(menu->input_ctx, mp_input_parse_cmd("menu hide")); + mp_input_queue_cmd(menu->input_ctx, c); + } else mp_msg(MSGT_GLOBAL,MSGL_WARN,MSGTR_LIBMENU_FailedToBuildCommand,str); } break; |