diff options
author | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-09 02:02:51 +0000 |
---|---|---|
committer | Jeffrey Goode <jeffg7@gmail.com> | 2010-05-09 02:02:51 +0000 |
commit | 1ad76ff25be3f86b9467fc6f4171dbf6895b419c (patch) | |
tree | e679a66806c1a89343a29324dd2a6bc860d4a86d /apps/menu.c | |
parent | 8d3553489f1dd44b9dd3b7493489e9ec03f387be (diff) | |
download | rockbox-1ad76ff25be3f86b9467fc6f4171dbf6895b419c.tar.gz rockbox-1ad76ff25be3f86b9467fc6f4171dbf6895b419c.zip |
FS#11250: Hotkey setting method changed to menu item vs button pres in context menu. Manuals updated to match.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25905 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.c')
-rw-r--r-- | apps/menu.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/apps/menu.c b/apps/menu.c index bfad812803..670a235202 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -61,12 +61,6 @@ | |||
61 | #include "list.h" | 61 | #include "list.h" |
62 | #include "buttonbar.h" | 62 | #include "buttonbar.h" |
63 | 63 | ||
64 | /* hotkey settings */ | ||
65 | #ifdef HAVE_HOTKEY | ||
66 | const struct menu_item_ex *selected_menu_item; | ||
67 | bool hotkey_settable_menu = false; | ||
68 | #endif | ||
69 | |||
70 | #define MAX_MENUS 8 | 64 | #define MAX_MENUS 8 |
71 | /* used to allow for dynamic menus */ | 65 | /* used to allow for dynamic menus */ |
72 | #define MAX_MENU_SUBITEMS 64 | 66 | #define MAX_MENU_SUBITEMS 64 |
@@ -432,22 +426,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected, | |||
432 | done = true; | 426 | done = true; |
433 | } | 427 | } |
434 | #endif | 428 | #endif |
435 | #ifdef HAVE_HOTKEY | ||
436 | else if (hotkey_settable_menu && | ||
437 | ((action == ACTION_WPS_HOTKEY) || | ||
438 | (action == ACTION_TREE_HOTKEY))) | ||
439 | { | ||
440 | int this = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu); | ||
441 | temp = menu->submenus[this]; | ||
442 | if (temp->flags&MENU_FUNC_HOTKEYABLE) | ||
443 | { | ||
444 | selected_menu_item = temp; | ||
445 | selected = this; | ||
446 | ret = MENU_SELECTED_HOTKEY; | ||
447 | done = true; | ||
448 | } | ||
449 | } | ||
450 | #endif | ||
451 | else if (action == ACTION_TREE_WPS) | 429 | else if (action == ACTION_TREE_WPS) |
452 | { | 430 | { |
453 | ret = GO_TO_PREVIOUS_MUSIC; | 431 | ret = GO_TO_PREVIOUS_MUSIC; |