summaryrefslogtreecommitdiffstats
path: root/apps/menu.c
diff options
context:
space:
mode:
authorJeffrey Goode <jeffg7@gmail.com>2010-05-09 02:02:51 +0000
committerJeffrey Goode <jeffg7@gmail.com>2010-05-09 02:02:51 +0000
commit1ad76ff25be3f86b9467fc6f4171dbf6895b419c (patch)
treee679a66806c1a89343a29324dd2a6bc860d4a86d /apps/menu.c
parent8d3553489f1dd44b9dd3b7493489e9ec03f387be (diff)
downloadrockbox-1ad76ff25be3f86b9467fc6f4171dbf6895b419c.tar.gz
rockbox-1ad76ff25be3f86b9467fc6f4171dbf6895b419c.tar.bz2
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.c22
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 @@
#include "list.h"
#include "buttonbar.h"
-/* hotkey settings */
-#ifdef HAVE_HOTKEY
-const struct menu_item_ex *selected_menu_item;
-bool hotkey_settable_menu = false;
-#endif
-
#define MAX_MENUS 8
/* used to allow for dynamic menus */
#define MAX_MENU_SUBITEMS 64
@@ -432,22 +426,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
done = true;
}
#endif
-#ifdef HAVE_HOTKEY
- else if (hotkey_settable_menu &&
- ((action == ACTION_WPS_HOTKEY) ||
- (action == ACTION_TREE_HOTKEY)))
- {
- int this = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu);
- temp = menu->submenus[this];
- if (temp->flags&MENU_FUNC_HOTKEYABLE)
- {
- selected_menu_item = temp;
- selected = this;
- ret = MENU_SELECTED_HOTKEY;
- done = true;
- }
- }
-#endif
else if (action == ACTION_TREE_WPS)
{
ret = GO_TO_PREVIOUS_MUSIC;