diff options
author | Dominik Wenger <domonoky@googlemail.com> | 2009-01-16 15:35:05 +0000 |
---|---|---|
committer | Dominik Wenger <domonoky@googlemail.com> | 2009-01-16 15:35:05 +0000 |
commit | 15013562dc248acf1960dc99a9a6c7f74d76d8b0 (patch) | |
tree | 815f7c42e2a4f5f7bd3ea24f540762c0aa25eabc /apps | |
parent | e6bf9f9ff88c7e862f6fb4c94c1809c63641530d (diff) | |
download | rockbox-15013562dc248acf1960dc99a9a6c7f74d76d8b0.tar.gz rockbox-15013562dc248acf1960dc99a9a6c7f74d76d8b0.zip |
revert/fix parts of r19673, as it changed some e200 keymaps and introduces not-needed FIXME comments.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19778 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/blackjack.c | 19 | ||||
-rw-r--r-- | apps/plugins/bubbles.c | 1 | ||||
-rw-r--r-- | apps/plugins/calculator.c | 3 | ||||
-rw-r--r-- | apps/plugins/dict.c | 2 | ||||
-rw-r--r-- | apps/plugins/euroconverter.c | 1 | ||||
-rw-r--r-- | apps/plugins/keybox.c | 1 | ||||
-rw-r--r-- | apps/plugins/matrix.c | 1 | ||||
-rw-r--r-- | apps/plugins/mosaique.c | 1 | ||||
-rw-r--r-- | apps/plugins/mp3_encoder.c | 1 | ||||
-rw-r--r-- | apps/plugins/nim.c | 1 | ||||
-rw-r--r-- | apps/plugins/pegbox.c | 1 | ||||
-rw-r--r-- | apps/plugins/plasma.c | 2 | ||||
-rw-r--r-- | apps/plugins/rockblox.c | 5 | ||||
-rw-r--r-- | apps/plugins/rockblox1d.c | 1 | ||||
-rw-r--r-- | apps/plugins/snow.c | 1 | ||||
-rw-r--r-- | apps/plugins/stats.c | 1 | ||||
-rw-r--r-- | apps/plugins/stopwatch.c | 3 |
17 files changed, 19 insertions, 26 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 274e2033fa..4c7d51fad7 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -160,8 +160,22 @@ PLUGIN_HEADER | |||
160 | #define BJACK_RIGHT BUTTON_RIGHT | 160 | #define BJACK_RIGHT BUTTON_RIGHT |
161 | #define BJACK_LEFT BUTTON_LEFT | 161 | #define BJACK_LEFT BUTTON_LEFT |
162 | 162 | ||
163 | #elif CONFIG_KEYPAD == SANSA_E200_PAD || \ | 163 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
164 | (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 164 | #define BJACK_START BUTTON_SELECT |
165 | #define BJACK_QUIT BUTTON_POWER | ||
166 | #define BJACK_MAX (BUTTON_REC|BUTTON_UP) | ||
167 | #define BJACK_MIN (BUTTON_REC|BUTTON_DOWN) | ||
168 | #define BJACK_HIT BUTTON_SELECT | ||
169 | #define BJACK_STAY BUTTON_RIGHT | ||
170 | #define BJACK_DOUBLEDOWN BUTTON_LEFT | ||
171 | #define BJACK_SCORES BUTTON_UP | ||
172 | #define BJACK_RESUME BUTTON_DOWN | ||
173 | #define BJACK_UP BUTTON_SCROLL_FWD | ||
174 | #define BJACK_DOWN BUTTON_SCROLL_BACK | ||
175 | #define BJACK_RIGHT BUTTON_RIGHT | ||
176 | #define BJACK_LEFT BUTTON_LEFT | ||
177 | |||
178 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | ||
165 | #define BJACK_START BUTTON_SELECT | 179 | #define BJACK_START BUTTON_SELECT |
166 | #define BJACK_QUIT BUTTON_POWER | 180 | #define BJACK_QUIT BUTTON_POWER |
167 | #define BJACK_MAX (BUTTON_SELECT|BUTTON_UP) | 181 | #define BJACK_MAX (BUTTON_SELECT|BUTTON_UP) |
@@ -176,6 +190,7 @@ PLUGIN_HEADER | |||
176 | #define BJACK_RIGHT BUTTON_RIGHT | 190 | #define BJACK_RIGHT BUTTON_RIGHT |
177 | #define BJACK_LEFT BUTTON_LEFT | 191 | #define BJACK_LEFT BUTTON_LEFT |
178 | 192 | ||
193 | |||
179 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 194 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
180 | #define BJACK_START BUTTON_SELECT | 195 | #define BJACK_START BUTTON_SELECT |
181 | #define BJACK_QUIT BUTTON_POWER | 196 | #define BJACK_QUIT BUTTON_POWER |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index 5e338588de..c776b6768e 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -59,7 +59,6 @@ PLUGIN_HEADER | |||
59 | #define MAX_SHOTTIME 1000 | 59 | #define MAX_SHOTTIME 1000 |
60 | 60 | ||
61 | /* keyboard layouts */ | 61 | /* keyboard layouts */ |
62 | /* FIXME: shouldn't the below be #ifdef HAVE_SCROLLWHEEL rather? */ | ||
63 | 62 | ||
64 | #if (CONFIG_KEYPAD != SANSA_E200_PAD) && \ | 63 | #if (CONFIG_KEYPAD != SANSA_E200_PAD) && \ |
65 | (CONFIG_KEYPAD != SANSA_FUZE_PAD) | 64 | (CONFIG_KEYPAD != SANSA_FUZE_PAD) |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 7d93a24196..434f0482b7 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -210,9 +210,8 @@ PLUGIN_HEADER | |||
210 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) | 210 | #define CALCULATOR_CALC (BUTTON_SELECT|BUTTON_REPEAT) |
211 | #if (CONFIG_KEYPAD == SANSA_E200_PAD) | 211 | #if (CONFIG_KEYPAD == SANSA_E200_PAD) |
212 | #define CALCULATOR_CLEAR BUTTON_REC | 212 | #define CALCULATOR_CLEAR BUTTON_REC |
213 | /* FIXME: define as soon as HOME works | ||
214 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 213 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
215 | #define CALCULATOR_CLEAR BUTTON_HOME */ | 214 | #define CALCULATOR_CLEAR BUTTON_HOME |
216 | #endif | 215 | #endif |
217 | 216 | ||
218 | 217 | ||
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 9c7e8594fa..34b762f3b0 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -102,7 +102,6 @@ long reverse (long N) { | |||
102 | } | 102 | } |
103 | #endif | 103 | #endif |
104 | 104 | ||
105 | /* TODO: Clean up, most use BUTTON_POWER, could be the #else case */ | ||
106 | /* Button definitions */ | 105 | /* Button definitions */ |
107 | #if CONFIG_KEYPAD == PLAYER_PAD | 106 | #if CONFIG_KEYPAD == PLAYER_PAD |
108 | #define LP_QUIT BUTTON_STOP | 107 | #define LP_QUIT BUTTON_STOP |
@@ -145,7 +144,6 @@ long reverse (long N) { | |||
145 | #endif | 144 | #endif |
146 | 145 | ||
147 | /* data files */ | 146 | /* data files */ |
148 | /* FIXME: use "PLUGIN_APPS_DIR" */ | ||
149 | #define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index" | 147 | #define DICT_INDEX ROCKBOX_DIR "/rocks/apps/dict.index" |
150 | #define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc" | 148 | #define DICT_DESC ROCKBOX_DIR "/rocks/apps/dict.desc" |
151 | 149 | ||
diff --git a/apps/plugins/euroconverter.c b/apps/plugins/euroconverter.c index a9ec72d2b3..58c9f1c4ad 100644 --- a/apps/plugins/euroconverter.c +++ b/apps/plugins/euroconverter.c | |||
@@ -21,7 +21,6 @@ | |||
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | #include "lib/configfile.h" | 22 | #include "lib/configfile.h" |
23 | 23 | ||
24 | /* FIXME: Only for LCD_CHARCELL ?? */ | ||
25 | #ifdef HAVE_LCD_CHARCELLS | 24 | #ifdef HAVE_LCD_CHARCELLS |
26 | 25 | ||
27 | /* Euro converter for the player */ | 26 | /* Euro converter for the player */ |
diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c index 3c874a6549..5575a8b3a5 100644 --- a/apps/plugins/keybox.c +++ b/apps/plugins/keybox.c | |||
@@ -23,7 +23,6 @@ | |||
23 | PLUGIN_HEADER | 23 | PLUGIN_HEADER |
24 | 24 | ||
25 | 25 | ||
26 | /* FIXME: use "PLUGIN_APPS_DIR" */ | ||
27 | #define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat" | 26 | #define KEYBOX_FILE PLUGIN_DIR "/apps/keybox.dat" |
28 | #define BLOCK_SIZE 8 | 27 | #define BLOCK_SIZE 8 |
29 | #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */ | 28 | #define MAX_ENTRIES 12*BLOCK_SIZE /* keep this a multiple of BLOCK_SIZE */ |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index a3b0b850d8..d7d2469b07 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -49,7 +49,6 @@ extern const fb_data matrix_normal[]; | |||
49 | #define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2 | 49 | #define LEFTMARGIN (LCD_WIDTH-(COLS*COL_W))/2 |
50 | #define TOPMARGIN (LCD_HEIGHT-(ROWS*COL_H))/2 | 50 | #define TOPMARGIN (LCD_HEIGHT-(ROWS*COL_H))/2 |
51 | 51 | ||
52 | /* FIXME: could use plugin lib actions */ | ||
53 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 52 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
54 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 53 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
55 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 54 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index adb0d423f2..81b79c73ac 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -42,7 +42,6 @@ PLUGIN_HEADER | |||
42 | #define GFX_HEIGHT 6 | 42 | #define GFX_HEIGHT 6 |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | /* FIXME: could use plugin lib actions */ | ||
46 | /* variable button definitions */ | 45 | /* variable button definitions */ |
47 | #if CONFIG_KEYPAD == RECORDER_PAD | 46 | #if CONFIG_KEYPAD == RECORDER_PAD |
48 | #define MOSAIQUE_QUIT BUTTON_OFF | 47 | #define MOSAIQUE_QUIT BUTTON_OFF |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index b77058e97e..93de53edac 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2427,7 +2427,6 @@ void get_mp3_filename(const char *wav_name) | |||
2427 | #define MP3ENC_NEXT BUTTON_DOWN | 2427 | #define MP3ENC_NEXT BUTTON_DOWN |
2428 | #define MP3ENC_DONE BUTTON_POWER | 2428 | #define MP3ENC_DONE BUTTON_POWER |
2429 | #define MP3ENC_SELECT BUTTON_SELECT | 2429 | #define MP3ENC_SELECT BUTTON_SELECT |
2430 | /* FIXME: e200 could use scrollwheel */ | ||
2431 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 2430 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
2432 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 2431 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
2433 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 2432 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
diff --git a/apps/plugins/nim.c b/apps/plugins/nim.c index 4f8f33b03b..460e2751e9 100644 --- a/apps/plugins/nim.c +++ b/apps/plugins/nim.c | |||
@@ -20,7 +20,6 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | 22 | ||
23 | /* FIXME: Why only for charcell? */ | ||
24 | #ifdef HAVE_LCD_CHARCELLS | 23 | #ifdef HAVE_LCD_CHARCELLS |
25 | 24 | ||
26 | /* NIM game for the player | 25 | /* NIM game for the player |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 712d102a32..cc4d3aa7ab 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -39,7 +39,6 @@ PLUGIN_HEADER | |||
39 | #define PB_USB 2 | 39 | #define PB_USB 2 |
40 | #define PB_QUIT 1 | 40 | #define PB_QUIT 1 |
41 | 41 | ||
42 | /* FIXME: USE PLUGIN_GAMES_DIR */ | ||
43 | #define DATA_FILE PLUGIN_DIR "/games/pegbox.data" | 42 | #define DATA_FILE PLUGIN_DIR "/games/pegbox.data" |
44 | #define SAVE_FILE PLUGIN_DIR "/games/pegbox.save" | 43 | #define SAVE_FILE PLUGIN_DIR "/games/pegbox.save" |
45 | 44 | ||
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index 6bd4d095ce..1d3dd6c432 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -54,7 +54,6 @@ static size_t gbuf_size = 0; | |||
54 | static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */ | 54 | static unsigned char sp1, sp2, sp3, sp4; /* Speed of plasma */ |
55 | static int plasma_frequency; | 55 | static int plasma_frequency; |
56 | 56 | ||
57 | /* FIXME: Could use plugin lib actions */ | ||
58 | /* Key assignement, all bitmapped models */ | 57 | /* Key assignement, all bitmapped models */ |
59 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 58 | #if (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
60 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 59 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
@@ -67,7 +66,6 @@ static int plasma_frequency; | |||
67 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 66 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
68 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 67 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
69 | 68 | ||
70 | /* FIXME: Clip/fuze should use HOME instead of POWER */ | ||
71 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 69 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
72 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 70 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
73 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 71 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 639728b370..a68df25f2a 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -41,7 +41,6 @@ PLUGIN_HEADER | |||
41 | #define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY) | 41 | #define ROCKBLOX_RESTART (BUTTON_SELECT | BUTTON_PLAY) |
42 | #define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL) | 42 | #define ROCKBLOX_DROP (BUTTON_SELECT | BUTTON_REL) |
43 | 43 | ||
44 | /* FIXME: use HAVE_SCROLLWHEEL */ | ||
45 | #define SCROLL_WHEEL | 44 | #define SCROLL_WHEEL |
46 | 45 | ||
47 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 46 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
@@ -115,7 +114,6 @@ PLUGIN_HEADER | |||
115 | 114 | ||
116 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 115 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
117 | 116 | ||
118 | /* FIXME: No #define SCROLL_WHEEL here? */ | ||
119 | #define ROCKBLOX_OFF BUTTON_POWER | 117 | #define ROCKBLOX_OFF BUTTON_POWER |
120 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK | 118 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK |
121 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD | 119 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD |
@@ -127,7 +125,6 @@ PLUGIN_HEADER | |||
127 | 125 | ||
128 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 126 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
129 | 127 | ||
130 | /* FIXME: No #define SCROLL_WHEEL here? */ | ||
131 | #define ROCKBLOX_OFF BUTTON_POWER | 128 | #define ROCKBLOX_OFF BUTTON_POWER |
132 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK | 129 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK |
133 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD | 130 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD |
@@ -135,7 +132,7 @@ PLUGIN_HEADER | |||
135 | #define ROCKBLOX_LEFT BUTTON_LEFT | 132 | #define ROCKBLOX_LEFT BUTTON_LEFT |
136 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 133 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
137 | #define ROCKBLOX_DROP BUTTON_SELECT | 134 | #define ROCKBLOX_DROP BUTTON_SELECT |
138 | /* FIXME: | 135 | /* TODO: |
139 | #define ROCKBLOX_RESTART BUTTON_HOME */ | 136 | #define ROCKBLOX_RESTART BUTTON_HOME */ |
140 | #define ROCKBLOX_RESTART BUTTON_SELECT|BUTTON_DOWN | 137 | #define ROCKBLOX_RESTART BUTTON_SELECT|BUTTON_DOWN |
141 | 138 | ||
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 0c6186b0ff..38126d2239 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | PLUGIN_HEADER | 25 | PLUGIN_HEADER |
26 | 26 | ||
27 | /* FIXME: Could use plugin lib action */ | ||
28 | 27 | ||
29 | #ifdef HAVE_LCD_BITMAP | 28 | #ifdef HAVE_LCD_BITMAP |
30 | 29 | ||
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 4996cd3fd5..1cfc3345ab 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -35,7 +35,6 @@ PLUGIN_HEADER | |||
35 | #define MYLCD(fn) pgfx_ ## fn | 35 | #define MYLCD(fn) pgfx_ ## fn |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | /* FIXME: Could use pluginlib actions, or at least cleaned up */ | ||
39 | /* variable button definitions */ | 38 | /* variable button definitions */ |
40 | #if CONFIG_KEYPAD == PLAYER_PAD | 39 | #if CONFIG_KEYPAD == PLAYER_PAD |
41 | #define SNOW_QUIT BUTTON_STOP | 40 | #define SNOW_QUIT BUTTON_STOP |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 95611e6f2e..0219d0fb0d 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -26,7 +26,6 @@ static int files, dirs, musicfiles, largestdir; | |||
26 | static int lasttick; | 26 | static int lasttick; |
27 | static bool abort; | 27 | static bool abort; |
28 | 28 | ||
29 | /* FIXME: Could use plugin lib actions or be cleaned up */ | ||
30 | #if CONFIG_KEYPAD == PLAYER_PAD | 29 | #if CONFIG_KEYPAD == PLAYER_PAD |
31 | #define STATS_STOP BUTTON_STOP | 30 | #define STATS_STOP BUTTON_STOP |
32 | 31 | ||
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 9395dde31e..0de01287cd 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -32,7 +32,6 @@ PLUGIN_HEADER | |||
32 | #define LAP_Y TIMER_Y+1 | 32 | #define LAP_Y TIMER_Y+1 |
33 | #define MAX_LAPS 64 | 33 | #define MAX_LAPS 64 |
34 | 34 | ||
35 | /* FIXME: Use PLUGIN_APPS_DIR */ | ||
36 | #define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat" | 35 | #define STOPWATCH_FILE ROCKBOX_DIR "/apps/stopwatch.dat" |
37 | 36 | ||
38 | /* variable button definitions */ | 37 | /* variable button definitions */ |
@@ -106,7 +105,6 @@ PLUGIN_HEADER | |||
106 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 105 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
107 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 106 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
108 | 107 | ||
109 | /* FIXME: e200 could use scrollwheel */ | ||
110 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 108 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
111 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 109 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
112 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ | 110 | (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \ |
@@ -123,7 +121,6 @@ PLUGIN_HEADER | |||
123 | #define STOPWATCH_START_STOP BUTTON_RIGHT | 121 | #define STOPWATCH_START_STOP BUTTON_RIGHT |
124 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT | 122 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT |
125 | #define STOPWATCH_LAP_TIMER BUTTON_SELECT | 123 | #define STOPWATCH_LAP_TIMER BUTTON_SELECT |
126 | /* FIXME: ipods scroll other way around, investigate */ | ||
127 | #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_BACK | 124 | #define STOPWATCH_SCROLL_UP BUTTON_SCROLL_BACK |
128 | #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_FWD | 125 | #define STOPWATCH_SCROLL_DOWN BUTTON_SCROLL_FWD |
129 | 126 | ||