summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-07-18 18:13:53 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-07-18 18:13:53 +0000
commit7d4414ebd8ba8bb79359a72ccd7d0b71fdb0fd36 (patch)
tree23f93ba12642249730c9c78b554bb5b313574d06 /apps
parentbff5e3d7ab853b01f56a83c15b49faed720f2386 (diff)
downloadrockbox-7d4414ebd8ba8bb79359a72ccd7d0b71fdb0fd36.tar.gz
rockbox-7d4414ebd8ba8bb79359a72ccd7d0b71fdb0fd36.tar.bz2
rockbox-7d4414ebd8ba8bb79359a72ccd7d0b71fdb0fd36.zip
AB_REPEAT_ENABLE was never defined to 2
There's only 2 possibilities: defined or undefined git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27483 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/abrepeat.h6
-rw-r--r--apps/gui/statusbar.c2
-rw-r--r--apps/gui/wps.c8
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 @@
#define AB_MARKER_NONE 0
-#if (AB_REPEAT_ENABLE == 1)
#include "settings.h"
-#endif
void ab_repeat_init(void);
#if 0 /* Currently unused */
@@ -68,11 +66,7 @@ static inline bool ab_B_marker_set(void)
static inline bool ab_repeat_mode_enabled(void)
{
-#if (AB_REPEAT_ENABLE == 2)
- return ab_A_marker_set() || ab_B_marker_set();
-#else
return global_settings.repeat_mode == REPEAT_AB;
-#endif
}
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
case REPEAT_AB:
gui_statusbar_icon_play_mode(display, Icon_RepeatAB);
break;
-#endif /* AB_REPEAT_ENABLE == 1 */
+#endif /* AB_REPEAT_ENABLE */
case REPEAT_ONE:
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)
{
ab_jump_to_A_marker();
break;
-#if (AB_REPEAT_ENABLE == 2)
- } else {
- ab_reset_markers();
-#endif
}
}
else
@@ -915,10 +911,6 @@ long gui_wps_show(void)
{
ab_jump_to_A_marker();
break;
-#if (AB_REPEAT_ENABLE == 2)
- } else {
- ab_reset_markers();
-#endif
}
}
else