From 297e0504dad929f8990a654c4bc7a3e891ff41cb Mon Sep 17 00:00:00 2001
From: Rob Purchase <shotofadds@rockbox.org>
Date: Sun, 27 Apr 2008 15:30:19 +0000
Subject: FS#8708: D2/m:robe500 touchscreen keymaps by Andreas Mueller.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17261 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/vu_meter.c | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

(limited to 'apps/plugins/vu_meter.c')

diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 5a893d7..bdbab8c 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -202,21 +202,42 @@ PLUGIN_HEADER
 
 #elif CONFIG_KEYPAD == COWOND2_PAD
 #define VUMETER_QUIT BUTTON_POWER
-#define VUMETER_HELP BUTTON_SELECT
 #define VUMETER_MENU BUTTON_MENU
-#define VUMETER_MENU_EXIT BUTTON_LEFT
-#define VUMETER_MENU_EXIT2 BUTTON_POWER
-#define VUMETER_UP BUTTON_UP
-#define VUMETER_DOWN BUTTON_DOWN
-#define LABEL_HELP "SELECT"
+#define VUMETER_MENU_EXIT BUTTON_POWER
 #define LABEL_QUIT "POWER"
 #define LABEL_MENU "MENU"
-#define LABEL_VOLUME "UP/DOWN"
 
 #else
 #error No keymap defined!
 #endif
 
+#ifdef HAVE_TOUCHPAD
+#ifndef VUMETER_QUIT
+#define VUMETER_QUIT      BUTTON_TOPLEFT
+#define LABEL_QUIT        "TOPLEFT"
+#endif
+#ifndef VUMETER_HELP
+#define VUMETER_HELP      BUTTON_CENTER
+#define LABEL_HELP        "CENTRE"
+#endif
+#ifndef VUMETER_MENU
+#define VUMETER_MENU      BUTTON_TOPRIGHT
+#define LABEL_MENU        "TOPRIGHT"
+#endif
+#ifndef VUMETER_MENU_EXIT
+#define VUMETER_MENU_EXIT BUTTON_TOPLEFT
+#endif
+#ifndef VUMETER_UP
+#define VUMETER_UP        BUTTON_TOPMIDDLE
+#endif
+#ifndef VUMETER_DOWN
+#define VUMETER_DOWN      BUTTON_BOTTOMMIDDLE
+#endif
+#ifndef LABEL_VOLUME
+#define LABEL_VOLUME      "UP/DOWN"
+#endif
+#endif
+
 const struct plugin_api* rb;
 
 #if defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC)
-- 
cgit v1.1