diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/abrepeat.h | 6 | ||||
-rw-r--r-- | apps/gui/statusbar.c | 2 | ||||
-rw-r--r-- | apps/gui/wps.c | 8 |
3 files changed, 1 insertions, 15 deletions
diff --git a/apps/abrepeat.h b/apps/abrepeat.h index 3c9853f2c5..8d5ea9dd66 100644 --- a/apps/abrepeat.h +++ b/apps/abrepeat.h | |||
@@ -28,9 +28,7 @@ | |||
28 | 28 | ||
29 | #define AB_MARKER_NONE 0 | 29 | #define AB_MARKER_NONE 0 |
30 | 30 | ||
31 | #if (AB_REPEAT_ENABLE == 1) | ||
32 | #include "settings.h" | 31 | #include "settings.h" |
33 | #endif | ||
34 | 32 | ||
35 | void ab_repeat_init(void); | 33 | void ab_repeat_init(void); |
36 | #if 0 /* Currently unused */ | 34 | #if 0 /* Currently unused */ |
@@ -68,11 +66,7 @@ static inline bool ab_B_marker_set(void) | |||
68 | 66 | ||
69 | static inline bool ab_repeat_mode_enabled(void) | 67 | static inline bool ab_repeat_mode_enabled(void) |
70 | { | 68 | { |
71 | #if (AB_REPEAT_ENABLE == 2) | ||
72 | return ab_A_marker_set() || ab_B_marker_set(); | ||
73 | #else | ||
74 | return global_settings.repeat_mode == REPEAT_AB; | 69 | return global_settings.repeat_mode == REPEAT_AB; |
75 | #endif | ||
76 | } | 70 | } |
77 | 71 | ||
78 | static inline bool ab_reached_B_marker(unsigned int song_position) | 72 | static inline bool ab_reached_B_marker(unsigned int song_position) |
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 2194b2fca0..73ccfa7762 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -325,7 +325,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi | |||
325 | case REPEAT_AB: | 325 | case REPEAT_AB: |
326 | gui_statusbar_icon_play_mode(display, Icon_RepeatAB); | 326 | gui_statusbar_icon_play_mode(display, Icon_RepeatAB); |
327 | break; | 327 | break; |
328 | #endif /* AB_REPEAT_ENABLE == 1 */ | 328 | #endif /* AB_REPEAT_ENABLE */ |
329 | 329 | ||
330 | case REPEAT_ONE: | 330 | case REPEAT_ONE: |
331 | gui_statusbar_icon_play_mode(display, Icon_RepeatOne); | 331 | gui_statusbar_icon_play_mode(display, Icon_RepeatOne); |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 6b5270eb7e..a582afa76b 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -888,10 +888,6 @@ long gui_wps_show(void) | |||
888 | { | 888 | { |
889 | ab_jump_to_A_marker(); | 889 | ab_jump_to_A_marker(); |
890 | break; | 890 | break; |
891 | #if (AB_REPEAT_ENABLE == 2) | ||
892 | } else { | ||
893 | ab_reset_markers(); | ||
894 | #endif | ||
895 | } | 891 | } |
896 | } | 892 | } |
897 | else | 893 | else |
@@ -915,10 +911,6 @@ long gui_wps_show(void) | |||
915 | { | 911 | { |
916 | ab_jump_to_A_marker(); | 912 | ab_jump_to_A_marker(); |
917 | break; | 913 | break; |
918 | #if (AB_REPEAT_ENABLE == 2) | ||
919 | } else { | ||
920 | ab_reset_markers(); | ||
921 | #endif | ||
922 | } | 914 | } |
923 | } | 915 | } |
924 | else | 916 | else |