Mercurial > mplayer.hg
view libmenu/menu_cmdlist.c @ 10898:716edc005b18
patch from Pierre Lombard <p_l@gmx.fr>
If the sound channel is already busy the async open fails and returns
-EBUSY. There's no need to try to open it synchronously as it will block
mplayer till the sound channel is released.
(Granted there's a very slight chance your sound device happen to be
freed between those two calls but it's not the common case).
The behavior is changed by this oneliner to match the ao_oss behavior
(disable sound if the sound device is busy).
author | attila |
---|---|
date | Sun, 21 Sep 2003 09:49:05 +0000 |
parents | 440301fef3fe |
children | 931bdbc37ee0 |
line wrap: on
line source
#include "../config.h" #include <stdlib.h> #include <stdio.h> #include <ctype.h> #include <string.h> #include "img_format.h" #include "mp_image.h" #include "../m_option.h" #include "../m_struct.h" #include "../asxparser.h" #include "menu.h" #include "menu_list.h" #include "../libvo/font_load.h" #include "../input/input.h" #include "../version.h" struct list_entry_s { struct list_entry p; char* ok; char* cancel; }; struct menu_priv_s { menu_list_priv_t p; }; static struct menu_priv_s cfg_dflt = { MENU_LIST_PRIV_DFLT }; static m_option_t cfg_fields[] = { MENU_LIST_PRIV_FIELDS, { "title",M_ST_OFF(struct menu_priv_s,p.title), CONF_TYPE_STRING, 0, 0, 0, NULL }, { NULL, NULL, NULL, 0,0,0,NULL } }; #define mpriv (menu->priv) static void read_cmd(menu_t* menu,int cmd) { switch(cmd) { case MENU_CMD_OK: { if(mpriv->p.current->ok) { mp_cmd_t* c = mp_input_parse_cmd(mpriv->p.current->ok); if(c) mp_input_queue_cmd(c); } } break; case MENU_CMD_CANCEL: if(mpriv->p.current->cancel) { mp_cmd_t* c = mp_input_parse_cmd(mpriv->p.current->cancel); if(c) mp_input_queue_cmd(c); break; } default: menu_list_read_cmd(menu,cmd); } } static void read_key(menu_t* menu,int c){ menu_list_read_key(menu,c,0); } static void free_entry(list_entry_t* entry) { if(entry->ok) free(entry->ok); if(entry->cancel) free(entry->cancel); free(entry->p.txt); free(entry); } static void close(menu_t* menu) { menu_list_uninit(menu,free_entry); } static int parse_args(menu_t* menu,char* args) { char *element,*body, **attribs, *name, *ok, *cancel; list_entry_t* m = NULL; int r; ASX_Parser_t* parser = asx_parser_new(); while(1) { r = asx_get_element(parser,&args,&element,&body,&attribs); if(r < 0) { printf("Syntax error at line %d\n",parser->line); asx_parser_free(parser); return -1; } else if(r == 0) { asx_parser_free(parser); if(!m) printf("No entry found in the menu definition\n"); return m ? 1 : 0; } // Has it a name ? name = asx_get_attrib("name",attribs); if(!name) { printf("List menu entry definitions need a name (line %d)\n",parser->line); free(element); if(body) free(body); asx_free_attribs(attribs); continue; } ok = asx_get_attrib("ok",attribs); cancel = asx_get_attrib("cancel",attribs); m = calloc(1,sizeof(struct list_entry_s)); m->p.txt = name; m->ok = ok; m->cancel = cancel; menu_list_add_entry(menu,m); free(element); if(body) free(body); asx_free_attribs(attribs); } } static int open(menu_t* menu, char* args) { menu->draw = menu_list_draw; menu->read_cmd = read_cmd; menu->read_key = read_key; menu->close = close; if(!args) { printf("List menu need an argument\n"); return 0; } menu_list_init(menu); if(!parse_args(menu,args)) return 0; return 1; } const menu_info_t menu_info_cmdlist = { "Command list menu", "cmdlist", "Albeu", "", { "cmdlist_cfg", sizeof(struct menu_priv_s), &cfg_dflt, cfg_fields }, open };