diff options
-rw-r--r-- | apps/keymaps/keymap-ipod.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index bfef9c153b..895691d5bc 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -5,7 +5,8 @@ | |||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | 5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < |
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | 6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ |
7 | * \/ \/ \/ \/ \/ | 7 | * \/ \/ \/ \/ \/ |
8 | * | 8 | * $Id $ |
9 | * | ||
9 | * Copyright (C) 2006 Jonathan Gordon | 10 | * Copyright (C) 2006 Jonathan Gordon |
10 | * | 11 | * |
11 | * All files in this archive are subject to the GNU General Public License. | 12 | * All files in this archive are subject to the GNU General Public License. |
@@ -45,7 +46,7 @@ const struct button_mapping button_context_standard[] = { | |||
45 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 46 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
46 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 47 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
47 | 48 | ||
48 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | 49 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
49 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 50 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
50 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 51 | { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
51 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, | 52 | { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -110,7 +111,7 @@ const struct button_mapping button_context_settings[] = { | |||
110 | 111 | ||
111 | const struct button_mapping button_context_yesno[] = { | 112 | const struct button_mapping button_context_yesno[] = { |
112 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, | 113 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, |
113 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 114 | LAST_ITEM_IN_LIST |
114 | }; /* button_context_settings_yesno */ | 115 | }; /* button_context_settings_yesno */ |
115 | 116 | ||
116 | const struct button_mapping button_context_bmark[] = { | 117 | const struct button_mapping button_context_bmark[] = { |
@@ -164,7 +165,8 @@ const struct button_mapping* get_context_mapping(int context) | |||
164 | 165 | ||
165 | case CONTEXT_LIST: | 166 | case CONTEXT_LIST: |
166 | case CONTEXT_MAINMENU: | 167 | case CONTEXT_MAINMENU: |
167 | break; | 168 | return button_context_standard; |
169 | |||
168 | case CONTEXT_SETTINGS_EQ: | 170 | case CONTEXT_SETTINGS_EQ: |
169 | case CONTEXT_SETTINGS_COLOURCHOOSER: | 171 | case CONTEXT_SETTINGS_COLOURCHOOSER: |
170 | case CONTEXT_SETTINGS_TIME: | 172 | case CONTEXT_SETTINGS_TIME: |