From 5e5bfabf6731758302a8ec15dc4f93109bf91d84 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
Date: Wed, 16 Aug 2006 13:25:45 +0000
Subject: * fixed the pitch screen key mappings for all targets, targets
 require a mapping to access the screen from the wps

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10611 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/gwps.c | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

(limited to 'apps/gui/gwps.c')

diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 2b80172ad4..12e120f7d4 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "config.h"
 
 #include "system.h"
 #include "file.h"
@@ -373,10 +374,11 @@ long gui_wps_show(void)
                 audio_next();
                 break;
                 /* next / prev directories */
-            case ACTION_WPS_NEXTDIR:
+                /* and set A-B markers if in a-b mode */
+            case ACTION_WPS_ABSETB_NEXTDIR:
                 if (global_settings.party_mode)
                     break;
-#if defined(AB_REPEAT_ENABLE) && defined(WPS_AB_SHARE_DIR_BUTTONS)
+#if defined(AB_REPEAT_ENABLE)
                 if (ab_repeat_mode_enabled())
                 {
                     ab_set_B_marker(wps_state.id3->elapsed);
@@ -389,10 +391,10 @@ long gui_wps_show(void)
                     audio_next_dir();
                 }
                 break;
-            case ACTION_WPS_PREVDIR:
+            case ACTION_WPS_ABSETA_PREVDIR:
                 if (global_settings.party_mode)
                     break;
-#if defined(AB_REPEAT_ENABLE) && defined(WPS_AB_SHARE_DIR_BUTTONS)
+#if defined(AB_REPEAT_ENABLE)
                 if (ab_repeat_mode_enabled())
                     ab_set_A_marker(wps_state.id3->elapsed);
                 else
@@ -465,10 +467,10 @@ long gui_wps_show(void)
                 {
                     gui_wps_set_margin(&gui_wps[i]);
                 }
-#endif /* BUTTON_F3 */
+#endif 
                 restore = true;
                 break;
-#endif
+#endif /* BUTTON_F3 */
 
                 /* pitch screen */
 #ifdef HAVE_PITCHSCREEN
@@ -476,6 +478,7 @@ long gui_wps_show(void)
 #ifdef HAVE_LCD_COLOR
                 show_main_backdrop();
 #endif
+                action_signalscreenchange();
                 if (1 == pitch_screen())
                     return SYS_USB_CONNECTED;
 #ifdef HAVE_LCD_COLOR
@@ -505,22 +508,6 @@ long gui_wps_show(void)
                 }
                 ab_set_A_marker(wps_state.id3->elapsed);
                 break;
-
-
-            /* set A marker for A-B repeat */
-            case ACTION_WPSAB_SETA:
-                if (ab_repeat_mode_enabled())
-                    ab_set_A_marker(wps_state.id3->elapsed);
-                break;
-            /* set B marker for A-B repeat and jump to A */
-            case ACTION_WPSAB_SETB:
-                if (ab_repeat_mode_enabled())
-                {
-                    ab_set_B_marker(wps_state.id3->elapsed);
-                    ab_jump_to_A_marker();
-                    update_track = true;
-                }
-                break;
             /* reset A&B markers */
             case ACTION_WPSAB_RESET:
                 if (ab_repeat_mode_enabled())
-- 
cgit v1.2.3