diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-05-08 11:55:43 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-05-08 11:55:43 +0000 |
commit | 77a458a464450c4e9d6977ac3f27b0e56217443c (patch) | |
tree | 526440820d32959de28747194effefb2ad6012d0 /apps/menu.h | |
parent | b15ef987ca75a6940313ae22f638363d50d7919e (diff) | |
download | rockbox-77a458a464450c4e9d6977ac3f27b0e56217443c.tar.gz rockbox-77a458a464450c4e9d6977ac3f27b0e56217443c.zip |
Move the old api out of the core and into the plugin lib.
ew plugins shuold use the new api and not this one.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13358 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.h')
-rw-r--r-- | apps/menu.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/apps/menu.h b/apps/menu.h index 7e08ef5aac..7b26bbc90c 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
@@ -35,8 +35,6 @@ enum menu_item_type { | |||
35 | MT_FUNCTION_CALL, /* call a function from the menus */ | 35 | MT_FUNCTION_CALL, /* call a function from the menus */ |
36 | MT_RETURN_ID, /* returns the position of the selected item (starting at 0)*/ | 36 | MT_RETURN_ID, /* returns the position of the selected item (starting at 0)*/ |
37 | MT_RETURN_VALUE, /* returns a value associated with an item */ | 37 | MT_RETURN_VALUE, /* returns a value associated with an item */ |
38 | MT_OLD_MENU, /* used so we can wrap the old menu api | ||
39 | around the new api. Noone else should use this */ | ||
40 | }; | 38 | }; |
41 | #define MENU_TYPE_MASK 0xF /* MT_* type */ | 39 | #define MENU_TYPE_MASK 0xF /* MT_* type */ |
42 | 40 | ||
@@ -192,22 +190,4 @@ bool do_setting_from_menu(const struct menu_item_ex *temp); | |||
192 | { (void*)name##_},{.callback_and_desc = & name##__}}; | 190 | { (void*)name##_},{.callback_and_desc = & name##__}}; |
193 | 191 | ||
194 | 192 | ||
195 | /* OLD API - This is only here for plugin compatability now, will be dropped ASAP */ | ||
196 | struct menu_item { | ||
197 | unsigned char *desc; /* string or ID */ | ||
198 | bool (*function) (void); /* return true if USB was connected */ | ||
199 | }; | ||
200 | |||
201 | /* if button2 == button3 == NULL, button1 is the menu title */ | ||
202 | int menu_init(const struct menu_item* mitems, int count, | ||
203 | int (*callback)(int, int), | ||
204 | const char *button1, const char *button2, const char *button3); | ||
205 | void menu_exit(int menu); | ||
206 | |||
207 | /* Returns MENU_* define from root_menu.h, or number of selected menu item*/ | ||
208 | int menu_show(int m); | ||
209 | |||
210 | bool menu_run(int menu); | ||
211 | int menu_count(int menu); | ||
212 | |||
213 | #endif /* End __MENU_H__ */ | 193 | #endif /* End __MENU_H__ */ |