diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2009-05-13 08:27:36 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-05-13 08:27:36 +0000 |
commit | e1f343afc782dd322d49dcdc09f53ed06be8c3e2 (patch) | |
tree | 571ce135ec2cb8b8b3ac36940f8a759246df527c /apps/plugins | |
parent | 8033342d0fe3b977fc7cb1cd77ef408fc69f0878 (diff) | |
download | rockbox-e1f343afc782dd322d49dcdc09f53ed06be8c3e2.tar.gz rockbox-e1f343afc782dd322d49dcdc09f53ed06be8c3e2.zip |
Sansa Fuze : Fix r20680/FS#10075 (long HOME to exit plugins)
Some plugins were forgotten : mpegplayer, test_fps, test_scanrate
Some plugins use button_status() and can't use BUTTON_REL or BUTTON_REPEAT flags
rockblox1d : use single press BUTTON_HOME
doom : use single press BUTTON_HOME and BUTTON_POWER to open doors
I may have forgotten some plugins, I didn't test them one by one
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20925 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/doom/i_video.c | 8 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 13 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 13 | ||||
-rw-r--r-- | apps/plugins/rockblox1d.c | 2 | ||||
-rw-r--r-- | apps/plugins/test_fps.c | 2 | ||||
-rw-r--r-- | apps/plugins/test_scanrate.c | 10 |
6 files changed, 37 insertions, 11 deletions
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 2f0c9b42fd..759e2179aa 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -207,10 +207,10 @@ void I_ShutdownGraphics(void) | |||
207 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 207 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
208 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 208 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
209 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | 209 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT |
210 | #define DOOMBUTTON_SHOOT (BUTTON_SELECT | BUTTON_REL) | 210 | #define DOOMBUTTON_SHOOT BUTTON_SELECT |
211 | #define DOOMBUTTON_OPEN (BUTTON_SELECT | BUTTON_HOME) | 211 | #define DOOMBUTTON_OPEN BUTTON_POWER |
212 | #define DOOMBUTTON_ESC (BUTTON_HOME|BUTTON_REPEAT) | 212 | #define DOOMBUTTON_ESC BUTTON_HOME |
213 | #define DOOMBUTTON_ENTER (BUTTON_SELECT | BUTTON_REL) | 213 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
214 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW | 214 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW |
215 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 215 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
216 | #define DOOMBUTTON_UP BUTTON_UP | 216 | #define DOOMBUTTON_UP BUTTON_UP |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 189bdbcde7..8aea93b8f1 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -80,8 +80,7 @@ struct mpeg_settings settings; | |||
80 | #define MPEG_START_TIME_DOWN BUTTON_SCROLL_DOWN | 80 | #define MPEG_START_TIME_DOWN BUTTON_SCROLL_DOWN |
81 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 81 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
82 | 82 | ||
83 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) \ | 83 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
84 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
85 | #define MPEG_START_TIME_SELECT BUTTON_SELECT | 84 | #define MPEG_START_TIME_SELECT BUTTON_SELECT |
86 | #define MPEG_START_TIME_SCROLL_UP BUTTON_SCROLL_BACK | 85 | #define MPEG_START_TIME_SCROLL_UP BUTTON_SCROLL_BACK |
87 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_SCROLL_FWD | 86 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_SCROLL_FWD |
@@ -91,6 +90,16 @@ struct mpeg_settings settings; | |||
91 | #define MPEG_START_TIME_DOWN BUTTON_DOWN | 90 | #define MPEG_START_TIME_DOWN BUTTON_DOWN |
92 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 91 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
93 | 92 | ||
93 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
94 | #define MPEG_START_TIME_SELECT BUTTON_SELECT | ||
95 | #define MPEG_START_TIME_SCROLL_UP BUTTON_SCROLL_BACK | ||
96 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_SCROLL_FWD | ||
97 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | ||
98 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | ||
99 | #define MPEG_START_TIME_UP BUTTON_UP | ||
100 | #define MPEG_START_TIME_DOWN BUTTON_DOWN | ||
101 | #define MPEG_START_TIME_EXIT (BUTTON_HOME|BUTTON_REPEAT) | ||
102 | |||
94 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 103 | #elif (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
95 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 104 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
96 | (CONFIG_KEYPAD == SANSA_M200_PAD) | 105 | (CONFIG_KEYPAD == SANSA_M200_PAD) |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 0ade023185..0a12a78ceb 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -187,8 +187,7 @@ PLUGIN_IRAM_DECLARE | |||
187 | #define MPEG_RW BUTTON_REW | 187 | #define MPEG_RW BUTTON_REW |
188 | #define MPEG_FF BUTTON_FF | 188 | #define MPEG_FF BUTTON_FF |
189 | 189 | ||
190 | #elif CONFIG_KEYPAD == SANSA_E200_PAD \ | 190 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
191 | || CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
192 | #define MPEG_MENU BUTTON_SELECT | 191 | #define MPEG_MENU BUTTON_SELECT |
193 | #define MPEG_STOP BUTTON_POWER | 192 | #define MPEG_STOP BUTTON_POWER |
194 | #define MPEG_PAUSE BUTTON_UP | 193 | #define MPEG_PAUSE BUTTON_UP |
@@ -197,6 +196,16 @@ PLUGIN_IRAM_DECLARE | |||
197 | #define MPEG_RW BUTTON_LEFT | 196 | #define MPEG_RW BUTTON_LEFT |
198 | #define MPEG_FF BUTTON_RIGHT | 197 | #define MPEG_FF BUTTON_RIGHT |
199 | 198 | ||
199 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
200 | #define MPEG_MENU BUTTON_SELECT | ||
201 | #define MPEG_STOP (BUTTON_HOME|BUTTON_REPEAT) | ||
202 | #define MPEG_PAUSE BUTTON_UP | ||
203 | #define MPEG_VOLDOWN BUTTON_SCROLL_BACK | ||
204 | #define MPEG_VOLUP BUTTON_SCROLL_FWD | ||
205 | #define MPEG_RW BUTTON_LEFT | ||
206 | #define MPEG_FF BUTTON_RIGHT | ||
207 | |||
208 | |||
200 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ | 209 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || \ |
201 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ | 210 | CONFIG_KEYPAD == SANSA_CLIP_PAD || \ |
202 | CONFIG_KEYPAD == SANSA_M200_PAD | 211 | CONFIG_KEYPAD == SANSA_M200_PAD |
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 2774b2ca12..2db83d6537 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -67,7 +67,7 @@ PLUGIN_HEADER | |||
67 | 67 | ||
68 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 68 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
69 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT | 69 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT |
70 | #define ONEDROCKBLOX_QUIT (BUTTON_HOME|BUTTON_REPEAT) | 70 | #define ONEDROCKBLOX_QUIT BUTTON_HOME |
71 | 71 | ||
72 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 72 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
73 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY | 73 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY |
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c index c688a54de0..cba08f28d1 100644 --- a/apps/plugins/test_fps.c +++ b/apps/plugins/test_fps.c | |||
@@ -31,6 +31,8 @@ PLUGIN_IRAM_DECLARE | |||
31 | #define FPS_QUIT BUTTON_MENU | 31 | #define FPS_QUIT BUTTON_MENU |
32 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 32 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
33 | #define FPS_QUIT BUTTON_RC_REC | 33 | #define FPS_QUIT BUTTON_RC_REC |
34 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
35 | #define FPS_QUIT (BUTTON_HOME|BUTTON_REPEAT) | ||
34 | #elif defined(BUTTON_OFF) | 36 | #elif defined(BUTTON_OFF) |
35 | #define FPS_QUIT BUTTON_OFF | 37 | #define FPS_QUIT BUTTON_OFF |
36 | #else | 38 | #else |
diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c index 2504bd36ac..7a0a13bc94 100644 --- a/apps/plugins/test_scanrate.c +++ b/apps/plugins/test_scanrate.c | |||
@@ -35,14 +35,20 @@ PLUGIN_HEADER | |||
35 | 35 | ||
36 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ | 36 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
37 | || (CONFIG_KEYPAD == MROBE100_PAD) \ | 37 | || (CONFIG_KEYPAD == MROBE100_PAD) \ |
38 | || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \ | 38 | || (CONFIG_KEYPAD == SANSA_CLIP_PAD) |
39 | || (CONFIG_KEYPAD == SANSA_FUZE_PAD) | ||
40 | #define SCANRATE_DONE BUTTON_POWER | 39 | #define SCANRATE_DONE BUTTON_POWER |
41 | #define SCANRATE_FASTINC BUTTON_UP | 40 | #define SCANRATE_FASTINC BUTTON_UP |
42 | #define SCANRATE_FASTDEC BUTTON_DOWN | 41 | #define SCANRATE_FASTDEC BUTTON_DOWN |
43 | #define SCANRATE_INC BUTTON_RIGHT | 42 | #define SCANRATE_INC BUTTON_RIGHT |
44 | #define SCANRATE_DEC BUTTON_LEFT | 43 | #define SCANRATE_DEC BUTTON_LEFT |
45 | 44 | ||
45 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
46 | #define SCANRATE_DONE (BUTTON_HOME|BUTTON_REPEAT) | ||
47 | #define SCANRATE_FASTINC BUTTON_UP | ||
48 | #define SCANRATE_FASTDEC BUTTON_DOWN | ||
49 | #define SCANRATE_INC BUTTON_RIGHT | ||
50 | #define SCANRATE_DEC BUTTON_LEFT | ||
51 | |||
46 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 52 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
47 | #define SCANRATE_DONE BUTTON_RC_REC | 53 | #define SCANRATE_DONE BUTTON_RC_REC |
48 | #define SCANRATE_FASTINC BUTTON_RC_VOL_UP | 54 | #define SCANRATE_FASTINC BUTTON_RC_VOL_UP |