diff options
-rw-r--r-- | apps/gui/gwps.c | 8 | ||||
-rw-r--r-- | apps/gui/gwps.h | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index ea97e61d03..7c9bbc63d2 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -369,7 +369,8 @@ long gui_wps_show(void) | |||
369 | case WPS_FFWD: | 369 | case WPS_FFWD: |
370 | if (global_settings.party_mode) | 370 | if (global_settings.party_mode) |
371 | break; | 371 | break; |
372 | #ifdef WPS_NEXT_DIR | 372 | |
373 | #ifdef HAVE_DIR_NAVIGATION | ||
373 | if (current_tick - right_lastclick < HZ) | 374 | if (current_tick - right_lastclick < HZ) |
374 | { | 375 | { |
375 | audio_next_dir(); | 376 | audio_next_dir(); |
@@ -377,13 +378,15 @@ long gui_wps_show(void) | |||
377 | break; | 378 | break; |
378 | } | 379 | } |
379 | #endif | 380 | #endif |
381 | |||
380 | #ifdef WPS_RC_REW | 382 | #ifdef WPS_RC_REW |
381 | case WPS_RC_REW: | 383 | case WPS_RC_REW: |
382 | #endif | 384 | #endif |
383 | case WPS_REW: | 385 | case WPS_REW: |
384 | if (global_settings.party_mode) | 386 | if (global_settings.party_mode) |
385 | break; | 387 | break; |
386 | #ifdef WPS_PREV_DIR | 388 | |
389 | #ifdef HAVE_DIR_NAVIGATION | ||
387 | if (current_tick - left_lastclick < HZ) | 390 | if (current_tick - left_lastclick < HZ) |
388 | { | 391 | { |
389 | audio_prev_dir(); | 392 | audio_prev_dir(); |
@@ -391,6 +394,7 @@ long gui_wps_show(void) | |||
391 | break; | 394 | break; |
392 | } | 395 | } |
393 | #endif | 396 | #endif |
397 | |||
394 | ffwd_rew(button); | 398 | ffwd_rew(button); |
395 | break; | 399 | break; |
396 | 400 | ||
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 0c170f1a7e..08299acbfc 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -75,6 +75,8 @@ | |||
75 | #define WPS_AB_RESET_AB_MARKERS (BUTTON_ON | BUTTON_SELECT) | 75 | #define WPS_AB_RESET_AB_MARKERS (BUTTON_ON | BUTTON_SELECT) |
76 | #endif | 76 | #endif |
77 | 77 | ||
78 | #define HAVE_DIR_NAVIGATION | ||
79 | |||
78 | #elif CONFIG_KEYPAD == RECORDER_PAD | 80 | #elif CONFIG_KEYPAD == RECORDER_PAD |
79 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | 81 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) |
80 | #define WPS_NEXT_PRE BUTTON_RIGHT | 82 | #define WPS_NEXT_PRE BUTTON_RIGHT |
@@ -207,6 +209,8 @@ | |||
207 | #define WPS_AB_RESET_AB_MARKERS (BUTTON_LEFT | BUTTON_RIGHT) | 209 | #define WPS_AB_RESET_AB_MARKERS (BUTTON_LEFT | BUTTON_RIGHT) |
208 | #endif | 210 | #endif |
209 | 211 | ||
212 | #define HAVE_DIR_NAVIGATION | ||
213 | |||
210 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 214 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
211 | 215 | ||
212 | /* TODO: Check WPS button assignments */ | 216 | /* TODO: Check WPS button assignments */ |
@@ -247,6 +251,8 @@ | |||
247 | #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) | 251 | #define WPS_CONTEXT (BUTTON_SELECT | BUTTON_REPEAT) |
248 | #define WPS_QUICK (BUTTON_REC | BUTTON_REPEAT) | 252 | #define WPS_QUICK (BUTTON_REC | BUTTON_REPEAT) |
249 | 253 | ||
254 | #define HAVE_DIR_NAVIGATION | ||
255 | |||
250 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 256 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
251 | 257 | ||
252 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) | 258 | #define WPS_NEXT (BUTTON_RIGHT | BUTTON_REL) |
@@ -270,6 +276,8 @@ | |||
270 | #define WPS_NEXT_DIR (BUTTON_RIGHT | BUTTON_POWER) | 276 | #define WPS_NEXT_DIR (BUTTON_RIGHT | BUTTON_POWER) |
271 | #define WPS_PREV_DIR (BUTTON_LEFT | BUTTON_POWER) | 277 | #define WPS_PREV_DIR (BUTTON_LEFT | BUTTON_POWER) |
272 | 278 | ||
279 | #define HAVE_DIR_NAVIGATION | ||
280 | |||
273 | #endif | 281 | #endif |
274 | 282 | ||
275 | /* constants used in line_type and as refresh_mode for wps_refresh */ | 283 | /* constants used in line_type and as refresh_mode for wps_refresh */ |