Added menu button for remote (because the menu now supports the remote too).

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

2 files changed, 10 insertions, 2 deletions

diff --git a/apps/wps.c b/apps/wps.c
index d702282..783f252 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -592,9 +592,16 @@ long wps_show(void)
                 break;
 
                 /* menu key functions */
+#ifdef WPS_RC_MENU
+            case WPS_RC_MENU:
+#endif
             case WPS_MENU:
 #ifdef WPS_MENU_PRE
-                if (lastbutton != WPS_MENU_PRE)
+                if ((lastbutton != WPS_MENU_PRE)
+#ifdef WPS_RC_MENU_PRE
+                    && (lastbutton != WPS_RC_MENU_PRE)
+#endif
+                    )
                     break;
 #endif
                 lcd_stop_scroll();
diff --git a/apps/wps.h b/apps/wps.h
index 668f9f6..091ec80 100644
--- a/apps/wps.h
+++ b/apps/wps.h
@@ -46,7 +46,8 @@
 #define WPS_RC_INCVOL  BUTTON_RC_VOL_UP
 #define WPS_RC_DECVOL  BUTTON_RC_VOL_DOWN
 #define WPS_RC_EXIT    BUTTON_RC_STOP
-
+#define WPS_RC_MENU    (BUTTON_RC_MENU | BUTTON_REL)
+#define WPS_RC_MENU_PRE    BUTTON_RC_MENU
 
 #elif CONFIG_KEYPAD == RECORDER_PAD
 #define WPS_NEXT       (BUTTON_RIGHT | BUTTON_REL)