diff options
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/gwps.c | 22 | ||||
-rw-r--r-- | apps/gui/gwps.h | 5 |
2 files changed, 22 insertions, 5 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index f75dd80d0f..d7d436c089 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -426,7 +426,18 @@ long gui_wps_show(void) | |||
426 | case WPS_RC_NEXT_DIR: | 426 | case WPS_RC_NEXT_DIR: |
427 | #endif | 427 | #endif |
428 | case WPS_NEXT_DIR: | 428 | case WPS_NEXT_DIR: |
429 | audio_next_dir(); | 429 | #if defined(AB_REPEAT_ENABLE) && defined(WPS_AB_SHARE_DIR_BUTTONS) |
430 | if (ab_repeat_mode_enabled()) | ||
431 | { | ||
432 | ab_set_B_marker(wps_state.id3->elapsed); | ||
433 | ab_jump_to_A_marker(); | ||
434 | update_track = true; | ||
435 | } | ||
436 | else | ||
437 | #endif | ||
438 | { | ||
439 | audio_next_dir(); | ||
440 | } | ||
430 | break; | 441 | break; |
431 | #endif | 442 | #endif |
432 | #ifdef WPS_PREV_DIR | 443 | #ifdef WPS_PREV_DIR |
@@ -434,7 +445,14 @@ long gui_wps_show(void) | |||
434 | case WPS_RC_PREV_DIR: | 445 | case WPS_RC_PREV_DIR: |
435 | #endif | 446 | #endif |
436 | case WPS_PREV_DIR: | 447 | case WPS_PREV_DIR: |
437 | audio_prev_dir(); | 448 | #if defined(AB_REPEAT_ENABLE) && defined(WPS_AB_SHARE_DIR_BUTTONS) |
449 | if (ab_repeat_mode_enabled()) | ||
450 | ab_set_A_marker(wps_state.id3->elapsed); | ||
451 | else | ||
452 | #endif | ||
453 | { | ||
454 | audio_prev_dir(); | ||
455 | } | ||
438 | break; | 456 | break; |
439 | #endif | 457 | #endif |
440 | 458 | ||
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index 59c5019e39..eb976c9220 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -69,9 +69,8 @@ | |||
69 | #define WPS_RC_QUICK (BUTTON_RC_MODE | BUTTON_REPEAT) | 69 | #define WPS_RC_QUICK (BUTTON_RC_MODE | BUTTON_REPEAT) |
70 | 70 | ||
71 | #ifdef AB_REPEAT_ENABLE | 71 | #ifdef AB_REPEAT_ENABLE |
72 | #define WPS_AB_SET_A_MARKER (BUTTON_REC | BUTTON_LEFT) | 72 | #define WPS_AB_SHARE_DIR_BUTTONS |
73 | #define WPS_AB_SET_B_MARKER (BUTTON_REC | BUTTON_RIGHT) | 73 | #define WPS_AB_RESET_AB_MARKERS (BUTTON_ON | BUTTON_SELECT) |
74 | #define WPS_AB_RESET_AB_MARKERS (BUTTON_REC | BUTTON_OFF) | ||
75 | #endif | 74 | #endif |
76 | 75 | ||
77 | #elif CONFIG_KEYPAD == RECORDER_PAD | 76 | #elif CONFIG_KEYPAD == RECORDER_PAD |