diff options
author | Martin Scarratt <mmmm@rockbox.org> | 2006-09-23 11:05:13 +0000 |
---|---|---|
committer | Martin Scarratt <mmmm@rockbox.org> | 2006-09-23 11:05:13 +0000 |
commit | a2ac8f42b10ff91f183a8f46108bf12a9d96e142 (patch) | |
tree | 5ea71b0f7c986ad38728bca0dcce285fbb63c6a4 | |
parent | 45ab2a91265845236dc3894c04c91b2b27c56c27 (diff) | |
download | rockbox-a2ac8f42b10ff91f183a8f46108bf12a9d96e142.tar.gz rockbox-a2ac8f42b10ff91f183a8f46108bf12a9d96e142.zip |
Enable FM_MODE button and add new fm context types - now the radio should be fine!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11032 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/keymaps/keymap-ondio.c | 8 | ||||
-rw-r--r-- | apps/keymaps/keymap-recorder.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-x5.c | 2 | ||||
-rw-r--r-- | apps/recorder/radio.c | 3 |
4 files changed, 15 insertions, 0 deletions
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c index 80b6923ffa..35243c5700 100644 --- a/apps/keymaps/keymap-ondio.c +++ b/apps/keymaps/keymap-ondio.c | |||
@@ -162,6 +162,12 @@ const struct button_mapping button_context_radio[] = { | |||
162 | { ACTION_FM_RECORD, BUTTON_MENU | BUTTON_REL, BUTTON_NONE }, | 162 | { ACTION_FM_RECORD, BUTTON_MENU | BUTTON_REL, BUTTON_NONE }, |
163 | { ACTION_FM_STOP, BUTTON_OFF | BUTTON_REL, BUTTON_OFF }, | 163 | { ACTION_FM_STOP, BUTTON_OFF | BUTTON_REL, BUTTON_OFF }, |
164 | { ACTION_FM_EXIT, BUTTON_OFF | BUTTON_REPEAT, BUTTON_OFF }, | 164 | { ACTION_FM_EXIT, BUTTON_OFF | BUTTON_REPEAT, BUTTON_OFF }, |
165 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | ||
166 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
167 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | ||
168 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
169 | |||
170 | |||
165 | 171 | ||
166 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 172 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
167 | 173 | ||
@@ -197,6 +203,8 @@ const struct button_mapping* get_context_mapping( int context ) | |||
197 | return button_context_recscreen; | 203 | return button_context_recscreen; |
198 | case CONTEXT_KEYBOARD: | 204 | case CONTEXT_KEYBOARD: |
199 | return button_context_keyboard; | 205 | return button_context_keyboard; |
206 | case CONTEXT_FM: | ||
207 | return button_context_radio; | ||
200 | 208 | ||
201 | case CONTEXT_LIST: | 209 | case CONTEXT_LIST: |
202 | case CONTEXT_MAINMENU: | 210 | case CONTEXT_MAINMENU: |
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index 489f9fbd44..02e720847f 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
@@ -281,6 +281,8 @@ const struct button_mapping* get_context_mapping( int context ) | |||
281 | return button_context_recscreen; | 281 | return button_context_recscreen; |
282 | case CONTEXT_KEYBOARD: | 282 | case CONTEXT_KEYBOARD: |
283 | return button_context_keyboard; | 283 | return button_context_keyboard; |
284 | case CONTEXT_FM: | ||
285 | return button_context_radio; | ||
284 | 286 | ||
285 | case CONTEXT_STD: | 287 | case CONTEXT_STD: |
286 | case CONTEXT_LIST: | 288 | case CONTEXT_LIST: |
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index 3bc6c97dee..b83cbe6dc1 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c | |||
@@ -357,6 +357,8 @@ const struct button_mapping* get_context_mapping( int context ) | |||
357 | return button_context_recscreen; | 357 | return button_context_recscreen; |
358 | case CONTEXT_KEYBOARD: | 358 | case CONTEXT_KEYBOARD: |
359 | return button_context_keyboard; | 359 | return button_context_keyboard; |
360 | case CONTEXT_FM: | ||
361 | return button_context_radio; | ||
360 | 362 | ||
361 | case CONTEXT_MAINMENU: | 363 | case CONTEXT_MAINMENU: |
362 | return button_context_menu; | 364 | return button_context_menu; |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 5b8faafae5..ece5d97a71 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -68,12 +68,15 @@ | |||
68 | #define FM_PRESET_ADD | 68 | #define FM_PRESET_ADD |
69 | #define FM_PRESET_ACTION | 69 | #define FM_PRESET_ACTION |
70 | #define FM_PRESET | 70 | #define FM_PRESET |
71 | #define FM_MODE | ||
71 | 72 | ||
72 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | 73 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
73 | #define FM_PRESET | 74 | #define FM_PRESET |
75 | #define FM_MODE | ||
74 | 76 | ||
75 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 77 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) |
76 | #define FM_PRESET | 78 | #define FM_PRESET |
79 | #define FM_MODE | ||
77 | 80 | ||
78 | #elif CONFIG_KEYPAD == ONDIO_PAD | 81 | #elif CONFIG_KEYPAD == ONDIO_PAD |
79 | #define FM_RECORD_DBLPRE | 82 | #define FM_RECORD_DBLPRE |