[MPlayer-cvslog] r25236 - in trunk/libmenu: menu.c menu.h

[ulion]

Author: ulion
Date: Sun Dec  2 12:14:50 2007
New Revision: 25236

Log:
Add type info to menu_t, now we can get the menu name and the type name of menu.


Modified:
   trunk/libmenu/menu.c
   trunk/libmenu/menu.h

Modified: trunk/libmenu/menu.c
==============================================================================
--- trunk/libmenu/menu.c	(original)
+++ trunk/libmenu/menu.c	Sun Dec  2 12:14:50 2007
@@ -46,12 +46,12 @@ menu_info_t* menu_info_list[] = {
   NULL
 };
 
-typedef struct menu_def_st {
+struct menu_def_st {
   char* name;
   menu_info_t* type;
   void* cfg;
   char* args;
-} menu_def_t;
+};
 
 static struct MPContext *menu_ctx = NULL;
 static menu_def_t* menu_list = NULL;
@@ -220,6 +220,7 @@ menu_t* menu_open(char *name) {
   m->priv_st = &(menu_list[i].type->priv_st);
   m->priv = m_struct_copy(m->priv_st,menu_list[i].cfg);
   m->ctx = menu_ctx;
+  m->type = &menu_list[i];
   if(menu_list[i].type->open(m,menu_list[i].args))
     return m;
   if(m->priv)

Modified: trunk/libmenu/menu.h
==============================================================================
--- trunk/libmenu/menu.h	(original)
+++ trunk/libmenu/menu.h	Sun Dec  2 12:14:50 2007
@@ -2,6 +2,8 @@
 struct menu_priv_s;
 typedef struct  menu_s menu_t;
 
+typedef struct menu_def_st menu_def_t;
+
 struct  menu_s {
   struct MPContext *ctx;
   void (*draw)(menu_t* menu,mp_image_t* mpi);
@@ -13,6 +15,7 @@ struct  menu_s {
   int show; // Draw it ?
   int cl; // Close request (user sent a close cmd or
   menu_t* parent;
+  menu_def_t *type;
 };
 
 typedef struct menu_info_s {