diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/fft/fft.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index 709fbf9f46..2b72d63188 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c | |||
@@ -45,6 +45,7 @@ GREY_INFO_STRUCT | |||
45 | # define FFT_WINDOW BUTTON_F1 | 45 | # define FFT_WINDOW BUTTON_F1 |
46 | # define FFT_AMP_SCALE BUTTON_UP | 46 | # define FFT_AMP_SCALE BUTTON_UP |
47 | # define FFT_QUIT BUTTON_OFF | 47 | # define FFT_QUIT BUTTON_OFF |
48 | /* Need FFT_FREQ_SCALE key */ | ||
48 | 49 | ||
49 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 50 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
50 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 51 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
@@ -111,6 +112,7 @@ GREY_INFO_STRUCT | |||
111 | # define FFT_WINDOW BUTTON_REC | 112 | # define FFT_WINDOW BUTTON_REC |
112 | # define FFT_AMP_SCALE BUTTON_SELECT | 113 | # define FFT_AMP_SCALE BUTTON_SELECT |
113 | # define FFT_QUIT BUTTON_POWER | 114 | # define FFT_QUIT BUTTON_POWER |
115 | /* Need FFT_FREQ_SCALE key */ | ||
114 | #elif (CONFIG_KEYPAD == SANSA_M200_PAD) | 116 | #elif (CONFIG_KEYPAD == SANSA_M200_PAD) |
115 | # define FFT_PREV_GRAPH BUTTON_LEFT | 117 | # define FFT_PREV_GRAPH BUTTON_LEFT |
116 | # define FFT_NEXT_GRAPH BUTTON_RIGHT | 118 | # define FFT_NEXT_GRAPH BUTTON_RIGHT |
@@ -118,14 +120,16 @@ GREY_INFO_STRUCT | |||
118 | # define FFT_WINDOW BUTTON_DOWN | 120 | # define FFT_WINDOW BUTTON_DOWN |
119 | # define FFT_AMP_SCALE BUTTON_SELECT | 121 | # define FFT_AMP_SCALE BUTTON_SELECT |
120 | # define FFT_QUIT BUTTON_POWER | 122 | # define FFT_QUIT BUTTON_POWER |
123 | /* Need FFT_FREQ_SCALE key */ | ||
121 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) | 124 | #elif (CONFIG_KEYPAD == SANSA_CLIP_PAD) |
122 | # define FFT_PREV_GRAPH BUTTON_LEFT | 125 | # define FFT_PREV_GRAPH BUTTON_LEFT |
123 | # define FFT_NEXT_GRAPH BUTTON_RIGHT | 126 | # define FFT_NEXT_GRAPH BUTTON_RIGHT |
124 | # define FFT_ORIENTATION BUTTON_UP | 127 | # define FFT_ORIENTATION BUTTON_UP |
128 | # define FFT_FREQ_SCALE BUTTON_DOWN | ||
125 | # define FFT_WINDOW BUTTON_HOME | 129 | # define FFT_WINDOW BUTTON_HOME |
126 | # define FFT_AMP_SCALE BUTTON_SELECT | 130 | # define FFT_AMP_SCALE BUTTON_SELECT |
127 | # define FFT_QUIT BUTTON_POWER | 131 | # define FFT_QUIT BUTTON_POWER |
128 | 132 | /* Need FFT_FREQ_SCALE key */ | |
129 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 133 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
130 | # define FFT_PREV_GRAPH BUTTON_LEFT | 134 | # define FFT_PREV_GRAPH BUTTON_LEFT |
131 | # define FFT_NEXT_GRAPH BUTTON_RIGHT | 135 | # define FFT_NEXT_GRAPH BUTTON_RIGHT |
@@ -160,7 +164,7 @@ GREY_INFO_STRUCT | |||
160 | # define FFT_WINDOW BUTTON_RC_PLAY | 164 | # define FFT_WINDOW BUTTON_RC_PLAY |
161 | # define FFT_AMP_SCALE BUTTON_RC_VOL_UP | 165 | # define FFT_AMP_SCALE BUTTON_RC_VOL_UP |
162 | # define FFT_QUIT BUTTON_RC_REC | 166 | # define FFT_QUIT BUTTON_RC_REC |
163 | 167 | /* Need FFT_FREQ_SCALE key */ | |
164 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) | 168 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
165 | # define FFT_QUIT BUTTON_POWER | 169 | # define FFT_QUIT BUTTON_POWER |
166 | # define FFT_PREV_GRAPH BUTTON_PLUS | 170 | # define FFT_PREV_GRAPH BUTTON_PLUS |
@@ -209,7 +213,7 @@ GREY_INFO_STRUCT | |||
209 | # define FFT_WINDOW BUTTON_DOWN | 213 | # define FFT_WINDOW BUTTON_DOWN |
210 | # define FFT_AMP_SCALE BUTTON_FFWD | 214 | # define FFT_AMP_SCALE BUTTON_FFWD |
211 | # define FFT_QUIT BUTTON_PLAY | 215 | # define FFT_QUIT BUTTON_PLAY |
212 | 216 | /* Need FFT_FREQ_SCALE key */ | |
213 | #elif (CONFIG_KEYPAD == MROBE500_PAD) | 217 | #elif (CONFIG_KEYPAD == MROBE500_PAD) |
214 | # define FFT_QUIT BUTTON_POWER | 218 | # define FFT_QUIT BUTTON_POWER |
215 | 219 | ||
@@ -226,7 +230,7 @@ GREY_INFO_STRUCT | |||
226 | # define FFT_WINDOW BUTTON_OK | 230 | # define FFT_WINDOW BUTTON_OK |
227 | # define FFT_AMP_SCALE BUTTON_PLAY | 231 | # define FFT_AMP_SCALE BUTTON_PLAY |
228 | # define FFT_QUIT BUTTON_REC | 232 | # define FFT_QUIT BUTTON_REC |
229 | 233 | /* Need FFT_FREQ_SCALE key */ | |
230 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 234 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
231 | # define FFT_PREV_GRAPH BUTTON_REW | 235 | # define FFT_PREV_GRAPH BUTTON_REW |
232 | # define FFT_NEXT_GRAPH BUTTON_FF | 236 | # define FFT_NEXT_GRAPH BUTTON_FF |
@@ -234,7 +238,7 @@ GREY_INFO_STRUCT | |||
234 | # define FFT_WINDOW BUTTON_FUNC | 238 | # define FFT_WINDOW BUTTON_FUNC |
235 | # define FFT_AMP_SCALE BUTTON_PLAY | 239 | # define FFT_AMP_SCALE BUTTON_PLAY |
236 | # define FFT_QUIT (BUTTON_REC | BUTTON_PLAY) | 240 | # define FFT_QUIT (BUTTON_REC | BUTTON_PLAY) |
237 | 241 | /* Need FFT_FREQ_SCALE key */ | |
238 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 242 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
239 | # define FFT_PREV_GRAPH BUTTON_REW | 243 | # define FFT_PREV_GRAPH BUTTON_REW |
240 | # define FFT_NEXT_GRAPH BUTTON_FF | 244 | # define FFT_NEXT_GRAPH BUTTON_FF |
@@ -242,7 +246,7 @@ GREY_INFO_STRUCT | |||
242 | # define FFT_WINDOW BUTTON_ENTER | 246 | # define FFT_WINDOW BUTTON_ENTER |
243 | # define FFT_AMP_SCALE BUTTON_PLAY | 247 | # define FFT_AMP_SCALE BUTTON_PLAY |
244 | # define FFT_QUIT (BUTTON_REC | BUTTON_REPEAT) | 248 | # define FFT_QUIT (BUTTON_REC | BUTTON_REPEAT) |
245 | 249 | /* Need FFT_FREQ_SCALE key */ | |
246 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 250 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
247 | # define FFT_PREV_GRAPH BUTTON_LEFT | 251 | # define FFT_PREV_GRAPH BUTTON_LEFT |
248 | # define FFT_NEXT_GRAPH BUTTON_RIGHT | 252 | # define FFT_NEXT_GRAPH BUTTON_RIGHT |
@@ -311,6 +315,7 @@ GREY_INFO_STRUCT | |||
311 | #ifndef FFT_QUIT | 315 | #ifndef FFT_QUIT |
312 | # define FFT_QUIT BUTTON_BOTTOMLEFT | 316 | # define FFT_QUIT BUTTON_BOTTOMLEFT |
313 | #endif | 317 | #endif |
318 | /* Need FFT_FREQ_SCALE key */ | ||
314 | #endif /* HAVE_TOUCHSCREEN */ | 319 | #endif /* HAVE_TOUCHSCREEN */ |
315 | 320 | ||
316 | #ifdef HAVE_LCD_COLOR | 321 | #ifdef HAVE_LCD_COLOR |
@@ -483,9 +488,7 @@ enum fft_setting_flags | |||
483 | FFT_SETF_OR = 1 << 0, | 488 | FFT_SETF_OR = 1 << 0, |
484 | FFT_SETF_DM = 1 << 1, | 489 | FFT_SETF_DM = 1 << 1, |
485 | FFT_SETF_AS = 1 << 2, | 490 | FFT_SETF_AS = 1 << 2, |
486 | #ifdef FFT_FREQ_SCALE /* 'Till all keymaps are defined */ | ||
487 | FFT_SETF_FS = 1 << 3, | 491 | FFT_SETF_FS = 1 << 3, |
488 | #endif | ||
489 | FFT_SETF_WF = 1 << 4, | 492 | FFT_SETF_WF = 1 << 4, |
490 | FFT_SETF_ALL = 0x1f | 493 | FFT_SETF_ALL = 0x1f |
491 | }; | 494 | }; |
@@ -1203,14 +1206,12 @@ static void fft_osd_format_message(enum fft_setting_flags id) | |||
1203 | }[fft.amp_scale]; | 1206 | }[fft.amp_scale]; |
1204 | break; | 1207 | break; |
1205 | 1208 | ||
1206 | #ifdef FFT_FREQ_SCALE /* 'Till all keymaps are defined */ | ||
1207 | case FFT_SETF_FS: | 1209 | case FFT_SETF_FS: |
1208 | msg = (const char * [FFT_MAX_FS]) { | 1210 | msg = (const char * [FFT_MAX_FS]) { |
1209 | [FFT_FS_LOG] = "Logarithmic frequency", | 1211 | [FFT_FS_LOG] = "Logarithmic frequency", |
1210 | [FFT_FS_LIN] = "Linear frequency", | 1212 | [FFT_FS_LIN] = "Linear frequency", |
1211 | }[fft.freq_scale]; | 1213 | }[fft.freq_scale]; |
1212 | break; | 1214 | break; |
1213 | #endif | ||
1214 | 1215 | ||
1215 | case FFT_SETF_OR: | 1216 | case FFT_SETF_OR: |
1216 | rb->snprintf(fft_osd_message, sizeof (fft_osd_message), | 1217 | rb->snprintf(fft_osd_message, sizeof (fft_osd_message), |
@@ -1351,13 +1352,11 @@ static void fft_setting_update(unsigned which) | |||
1351 | } | 1352 | } |
1352 | } | 1353 | } |
1353 | 1354 | ||
1354 | #ifdef FFT_FREQ_SCALE /* 'Till all keymaps are defined */ | ||
1355 | if(which & FFT_SETF_FS) | 1355 | if(which & FFT_SETF_FS) |
1356 | { | 1356 | { |
1357 | plot = fft.freq_scale == FFT_FS_LIN ? | 1357 | plot = fft.freq_scale == FFT_FS_LIN ? |
1358 | linf_magnitudes : logf_magnitudes; | 1358 | linf_magnitudes : logf_magnitudes; |
1359 | } | 1359 | } |
1360 | #endif | ||
1361 | 1360 | ||
1362 | if(which & FFT_SETF_AS) | 1361 | if(which & FFT_SETF_AS) |
1363 | { | 1362 | { |