AB-repeat mode for software codecs. Accessible through menu as a repeat mode, with buttom mappings much like those on other rockbox targets for now.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8409 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 60 insertions, 12 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index b9b3e9bcd0..31b4de239f 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_LCD_CHARCELLS
 #include "hwcompat.h"
 #endif
+#include "abrepeat.h"
 #include "mp3_playback.h"
 #include "backlight.h"
 #include "lang.h"
@@ -1431,8 +1432,8 @@ bool gui_wps_refresh(struct gui_wps *gwps, int ffwd_offset,
                                     HORIZONTAL);
 #ifdef AB_REPEAT_ENABLE
                 if ( ab_repeat_mode_enabled() )
-                    ab_draw_markers(state->id3->length, 0, sby, LCD_WIDTH,
-                                    PROGRESS_BAR_HEIGHT);
+                    ab_draw_markers(display, state->id3->length, 0, sby, 
+                            PROGRESS_BAR_HEIGHT);
 #endif
                 update_line = true;
             }
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index efe207f94a..f75dd80d0f 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -392,11 +392,17 @@ long gui_wps_show(void)
 #ifdef AB_REPEAT_ENABLE
                 /* if we're in A/B repeat mode and the current position
                    is past the A marker, jump back to the A marker... */
-                if ( ab_repeat_mode_enabled() 
-                     && ab_after_A_marker(wps_state.id3->elapsed) )
+                if ( ab_repeat_mode_enabled() )
                 {
-                    ab_jump_to_A_marker();
-                    break;
+                    if ( ab_after_A_marker(wps_state.id3->elapsed) )
+                    {
+                        ab_jump_to_A_marker();
+                        break;
+#if (AB_REPEAT_ENABLE == 2)
+                    } else {
+                        ab_reset_markers();
+#endif
+                    }
                 }
                 /* ...otherwise, do it normally */
 #endif
@@ -451,11 +457,17 @@ long gui_wps_show(void)
 #ifdef AB_REPEAT_ENABLE
                 /* if we're in A/B repeat mode and the current position is
                    before the A marker, jump to the A marker... */
-                if ( ab_repeat_mode_enabled() 
-                     && ab_before_A_marker(wps_state.id3->elapsed) )
+                if ( ab_repeat_mode_enabled() )
                 {
-                    ab_jump_to_A_marker();
-                    break;
+                    if ( ab_before_A_marker(wps_state.id3->elapsed) )
+                    {
+                        ab_jump_to_A_marker();
+                        break;
+#if (AB_REPEAT_ENABLE == 2)
+                    } else {
+                        ab_reset_markers();
+#endif
+                    }
                 }
                 /* ...otherwise, do it normally */
 #endif
@@ -545,6 +557,33 @@ long gui_wps_show(void)
 
 #ifdef AB_REPEAT_ENABLE
 
+#ifdef WPS_AB_SINGLE
+            case WPS_AB_SINGLE:
+#ifdef WPS_AB_SINGLE_PRE
+                if (lastbutton != WPS_AB_SINGLE_PRE)
+                    break;
+#endif
+/* If we are using the menu option to enable ab_repeat mode, don't do anything
+ * when it's disabled */
+#if (AB_REPEAT_ENABLE == 1)
+                if (!ab_repeat_mode_enabled())
+                    break;
+#endif
+                if (ab_A_marker_set()) {
+                    update_track = true;
+                    if (ab_B_marker_set()) {
+                        ab_reset_markers();
+                        break;
+                    }
+                    ab_set_B_marker(wps_state.id3->elapsed);
+                    ab_jump_to_A_marker();
+                    break;
+                }
+                ab_set_A_marker(wps_state.id3->elapsed);
+                break;
+#endif
+                
+                
 #ifdef WPS_AB_SET_A_MARKER
             /* set A marker for A-B repeat */
             case WPS_AB_SET_A_MARKER:
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 1017181a21..e00f6288ef 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -68,6 +68,12 @@
 #define WPS_RC_CONTEXT    (BUTTON_RC_MENU | BUTTON_REPEAT)
 #define WPS_RC_QUICK      (BUTTON_RC_MODE | BUTTON_REPEAT)
 
+#ifdef AB_REPEAT_ENABLE
+#define WPS_AB_SET_A_MARKER     (BUTTON_ON | BUTTON_LEFT)
+#define WPS_AB_SET_B_MARKER     (BUTTON_ON | BUTTON_RIGHT)
+#define WPS_AB_RESET_AB_MARKERS (BUTTON_ON | BUTTON_OFF)
+#endif
+
 #elif CONFIG_KEYPAD == RECORDER_PAD
 #define WPS_NEXT       (BUTTON_RIGHT | BUTTON_REL)
 #define WPS_NEXT_PRE   BUTTON_RIGHT
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index 07d4e2eee6..6aac24f81e 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -20,6 +20,7 @@
 #include "quickscreen.h"
 #ifdef HAS_QUICKSCREEN
 
+#include "system.h"
 #include "icons.h"
 #include "textarea.h"
 #include "font.h"
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index d8e611af85..34ac5283af 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -247,11 +247,11 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
                                                 Icon_Play);
 
         switch (bar->info.repeat) {
-#ifdef AB_REPEAT_ENABLE
+#if (AB_REPEAT_ENABLE == 1)
             case REPEAT_AB:
                 gui_statusbar_icon_play_mode(display, Icon_RepeatAB);
                 break;
-#endif /* AB_REPEAT_ENABLE */
+#endif /* AB_REPEAT_ENABLE == 1 */
 
             case REPEAT_ONE:
                 gui_statusbar_icon_play_mode(display, Icon_RepeatOne);
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c
index 3345a691ca..225f6d3f43 100644
--- a/apps/gui/yesno.c
+++ b/apps/gui/yesno.c
@@ -1,4 +1,5 @@
 #include "yesno.h"
+#include "system.h"
 #include "kernel.h"
 #include "misc.h"
 #include "lang.h"