diff options
| author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-25 10:26:39 +0000 |
|---|---|---|
| committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-05-25 10:26:39 +0000 |
| commit | 32012ea3bcd12f4b113c130a3b68e26dcf789158 (patch) | |
| tree | 61747c79452ce113e0e0584dcaa00ae6c7d1dc60 /libmenu | |
| parent | b4cf5f855cc71a998e897bcbc9f956cc5ccdd196 (diff) | |
| download | mpv-32012ea3bcd12f4b113c130a3b68e26dcf789158.tar.bz2 mpv-32012ea3bcd12f4b113c130a3b68e26dcf789158.tar.xz | |
rename some menu open functions, to avoid confusion with libc native open()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23384 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/menu_cmdlist.c | 4 | ||||
| -rw-r--r-- | libmenu/menu_txt.c | 4 | ||||
| -rw-r--r-- | libmenu/vf_menu.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libmenu/menu_cmdlist.c b/libmenu/menu_cmdlist.c index a003c16d34..b3e3879de1 100644 --- a/libmenu/menu_cmdlist.c +++ b/libmenu/menu_cmdlist.c @@ -149,7 +149,7 @@ static int parse_args(menu_t* menu,char* args) { } } -static int open(menu_t* menu, char* args) { +static int open_cmdlist(menu_t* menu, char* args) { menu->draw = menu_list_draw; menu->read_cmd = read_cmd; menu->read_key = read_key; @@ -177,5 +177,5 @@ const menu_info_t menu_info_cmdlist = { &cfg_dflt, cfg_fields }, - open + open_cmdlist }; diff --git a/libmenu/menu_txt.c b/libmenu/menu_txt.c index 2fb79fcec7..0f26596cc0 100644 --- a/libmenu/menu_txt.c +++ b/libmenu/menu_txt.c @@ -118,7 +118,7 @@ static void draw(menu_t* menu,mp_image_t* mpi) { #define BUF_SIZE 1024 -static int open(menu_t* menu, char* args) { +static int open_txt(menu_t* menu, char* args) { FILE* fd; char buf[BUF_SIZE]; char *l; @@ -192,5 +192,5 @@ const menu_info_t menu_info_txt = { &cfg_dflt, cfg_fields }, - open, + open_txt, }; diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 0363f4d95d..7996c24adc 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -280,7 +280,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ return (vf_next_query_format(vf,fmt)); } -static int open(vf_instance_t *vf, char* args){ +static int open_vf(vf_instance_t *vf, char* args){ if(!st_priv) { st_priv = calloc(1,sizeof(struct vf_priv_s)); st_priv->root = st_priv->current = menu_open(args); @@ -310,7 +310,7 @@ vf_info_t vf_info_menu = { "menu", "Albeu", "", - open, + open_vf, NULL }; |