summaryrefslogtreecommitdiff
path: root/apps/plugins/plasma.c
diff options
context:
space:
mode:
authorRob Purchase <shotofadds@rockbox.org>2008-04-27 15:30:19 +0000
committerRob Purchase <shotofadds@rockbox.org>2008-04-27 15:30:19 +0000
commit297e0504dad929f8990a654c4bc7a3e891ff41cb (patch)
tree7def4b8fba3c184f82415e840e9c32780848970b /apps/plugins/plasma.c
parent6b9b508aab29a406015e93c4808d87591173a083 (diff)
downloadrockbox-297e0504dad929f8990a654c4bc7a3e891ff41cb.zip
rockbox-297e0504dad929f8990a654c4bc7a3e891ff41cb.tar.gz
rockbox-297e0504dad929f8990a654c4bc7a3e891ff41cb.tar.bz2
rockbox-297e0504dad929f8990a654c4bc7a3e891ff41cb.tar.xz
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
Diffstat (limited to 'apps/plugins/plasma.c')
-rw-r--r--apps/plugins/plasma.c34
1 files changed, 28 insertions, 6 deletions
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c
index f013cef..3090e1a 100644
--- a/apps/plugins/plasma.c
+++ b/apps/plugins/plasma.c
@@ -99,13 +99,33 @@ static int plasma_frequency;
#elif (CONFIG_KEYPAD == COWOND2_PAD)
#define PLASMA_QUIT BUTTON_POWER
-#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
-#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-#else
-#define PLASMA_QUIT BUTTON_OFF
+// the new button definitions should be placed here
+#endif
+
+#ifdef HAVE_TOUCHPAD
+#ifndef PLASMA_QUIT
+#define PLASMA_QUIT BUTTON_TOPLEFT
+#endif
+#ifndef PLASMA_INCREASE_FREQUENCY
+#define PLASMA_INCREASE_FREQUENCY BUTTON_MIDRIGHT
+#endif
+#ifndef PLASMA_DECREASE_FREQUENCY
+#define PLASMA_DECREASE_FREQUENCY BUTTON_MIDLEFT
+#endif
+
+#endif
+
+// if no button definitions specified and no touchpad use default
+#ifndef PLASMA_QUIT
+#define PLASMA_QUIT BUTTON_OFF
+#endif
+#ifndef PLASMA_INCREASE_FREQUENCY
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
+#endif
+#ifndef PLASMA_DECREASE_FREQUENCY
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
+#endif
#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
#define PLASMA_RC_QUIT BUTTON_RC_STOP
@@ -128,8 +148,10 @@ static int plasma_frequency;
#define PLASMA_REGEN_COLORS BUTTON_SELECT
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
#define PLASMA_REGEN_COLORS BUTTON_SELECT
-#elif CONFIG_KEYPAD == COWOND2_PAD
-#define PLASMA_REGEN_COLORS BUTTON_SELECT
+#endif
+#ifdef HAVE_TOUCHPAD
+#ifndef PLASMA_REGEN_COLORS
+#define PLASMA_REGEN_COLORS BUTTON_CENTER
#endif
#endif