[MPlayer-cvslog] r23384 - in trunk/libmenu: menu_cmdlist.c menu_txt.c vf_menu.c

[ben]

Author: ben
Date: Fri May 25 12:26:39 2007
New Revision: 23384

Log:
rename some menu open functions, to avoid confusion with libc native open()

Modified:
   trunk/libmenu/menu_cmdlist.c
   trunk/libmenu/menu_txt.c
   trunk/libmenu/vf_menu.c

Modified: trunk/libmenu/menu_cmdlist.c
==============================================================================
--- trunk/libmenu/menu_cmdlist.c	(original)
+++ trunk/libmenu/menu_cmdlist.c	Fri May 25 12:26:39 2007
@@ -149,7 +149,7 @@ static int parse_args(menu_t* menu,char*
   }
 }
 
-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
 };

Modified: trunk/libmenu/menu_txt.c
==============================================================================
--- trunk/libmenu/menu_txt.c	(original)
+++ trunk/libmenu/menu_txt.c	Fri May 25 12:26:39 2007
@@ -118,7 +118,7 @@ static void draw(menu_t* menu,mp_image_t
     
 #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,
 };

Modified: trunk/libmenu/vf_menu.c
==============================================================================
--- trunk/libmenu/vf_menu.c	(original)
+++ trunk/libmenu/vf_menu.c	Fri May 25 12:26:39 2007
@@ -280,7 +280,7 @@ static int query_format(struct vf_instan
   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
 };