summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomer Shalev <shalev.tomer@gmail.com>2010-02-24 20:56:52 +0000
committerTomer Shalev <shalev.tomer@gmail.com>2010-02-24 20:56:52 +0000
commit12332ded12671ca27e82f7e354975d72c66d37e7 (patch)
treee2af598ad8ac53d7400eda2e5036fcefd7b4bdef
parent42552f8bf64d424da191c31d8e411008de03e6e8 (diff)
downloadrockbox-12332ded12671ca27e82f7e354975d72c66d37e7.tar.gz
rockbox-12332ded12671ca27e82f7e354975d72c66d37e7.tar.bz2
rockbox-12332ded12671ca27e82f7e354975d72c66d37e7.zip
Rockblox: Rename Rotate Left|Right to Rotate CW|CCW
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24893 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/rockblox.c132
1 files changed, 68 insertions, 64 deletions
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index d1dea6cd28..6ec0df760c 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -34,9 +34,9 @@ PLUGIN_HEADER
(CONFIG_KEYPAD == IPOD_1G2G_PAD)
#define ROCKBLOX_OFF (BUTTON_MENU | BUTTON_SELECT)
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK
-#define ROCKBLOX_ROTATE_RIGHT2 (BUTTON_MENU | BUTTON_REL)
-#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD
+#define ROCKBLOX_ROTATE_CCW BUTTON_SCROLL_BACK
+#define ROCKBLOX_ROTATE_CCW2 (BUTTON_MENU | BUTTON_REL)
+#define ROCKBLOX_ROTATE_CW BUTTON_SCROLL_FWD
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
#define ROCKBLOX_DOWN BUTTON_PLAY
@@ -47,8 +47,8 @@ PLUGIN_HEADER
(CONFIG_KEYPAD == IRIVER_H300_PAD)
#define ROCKBLOX_OFF BUTTON_OFF
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_SELECT
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_SELECT
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -60,8 +60,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == RECORDER_PAD
#define ROCKBLOX_OFF BUTTON_OFF
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_PLAY
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_PLAY
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -71,8 +71,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
#define ROCKBLOX_OFF BUTTON_OFF
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_SELECT
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_SELECT
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -83,8 +83,8 @@ PLUGIN_HEADER
#define ROCKBLOX_OFF_PRE BUTTON_STOP
#define ROCKBLOX_OFF (BUTTON_STOP|BUTTON_REL)
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_PLAY
-#define ROCKBLOX_ROTATE_LEFT (BUTTON_ON|BUTTON_PLAY)
+#define ROCKBLOX_ROTATE_CCW BUTTON_PLAY
+#define ROCKBLOX_ROTATE_CW (BUTTON_ON|BUTTON_PLAY)
#define ROCKBLOX_DOWN BUTTON_MENU
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -96,8 +96,8 @@ PLUGIN_HEADER
#define ROCKBLOX_OFF_PRE BUTTON_OFF
#define ROCKBLOX_OFF (BUTTON_OFF|BUTTON_REL)
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT (BUTTON_MENU|BUTTON_UP)
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CW (BUTTON_MENU|BUTTON_UP)
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -108,8 +108,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_SELECT
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_SELECT
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -119,9 +119,9 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SANSA_E200_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK
-#define ROCKBLOX_ROTATE_RIGHT2 BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD
+#define ROCKBLOX_ROTATE_CCW BUTTON_SCROLL_BACK
+#define ROCKBLOX_ROTATE_CCW2 BUTTON_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_SCROLL_FWD
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -131,9 +131,9 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SANSA_FUZE_PAD
#define ROCKBLOX_OFF (BUTTON_HOME|BUTTON_REPEAT)
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_BACK
-#define ROCKBLOX_ROTATE_RIGHT2 BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_SCROLL_FWD
+#define ROCKBLOX_ROTATE_CCW BUTTON_SCROLL_BACK
+#define ROCKBLOX_ROTATE_CCW2 BUTTON_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_SCROLL_FWD
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -144,9 +144,9 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SANSA_C200_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_RIGHT2 BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -156,9 +156,9 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SANSA_CLIP_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_RIGHT2 BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -168,9 +168,9 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SANSA_M200_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_RIGHT2 BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -180,8 +180,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == IRIVER_H10_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_SCROLL_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_REW
+#define ROCKBLOX_ROTATE_CCW BUTTON_SCROLL_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_REW
#define ROCKBLOX_DOWN BUTTON_SCROLL_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -191,8 +191,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == GIGABEAT_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP
+#define ROCKBLOX_ROTATE_CCW BUTTON_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
#define ROCKBLOX_ROTATE BUTTON_UP
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
@@ -203,8 +203,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
#define ROCKBLOX_OFF BUTTON_PLAY
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_SELECT
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_SELECT
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -216,8 +216,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD
#define ROCKBLOX_OFF BUTTON_BACK
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP
+#define ROCKBLOX_ROTATE_CCW BUTTON_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
#define ROCKBLOX_ROTATE BUTTON_UP
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
@@ -228,8 +228,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == MROBE100_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_MENU
-#define ROCKBLOX_ROTATE_LEFT BUTTON_PLAY
+#define ROCKBLOX_ROTATE_CCW BUTTON_MENU
+#define ROCKBLOX_ROTATE_CW BUTTON_PLAY
#define ROCKBLOX_ROTATE BUTTON_UP
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
@@ -240,8 +240,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
#define ROCKBLOX_OFF BUTTON_RC_REC
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_RC_VOL_DOWN
-#define ROCKBLOX_ROTATE_LEFT BUTTON_RC_VOL_UP
+#define ROCKBLOX_ROTATE_CCW BUTTON_RC_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW BUTTON_RC_VOL_UP
#define ROCKBLOX_DOWN BUTTON_RC_MENU
#define ROCKBLOX_LEFT BUTTON_RC_REW
#define ROCKBLOX_RIGHT BUTTON_RC_FF
@@ -255,8 +255,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == IAUDIO67_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_VOLDOWN
-#define ROCKBLOX_ROTATE_LEFT BUTTON_VOLUP
+#define ROCKBLOX_ROTATE_CCW BUTTON_VOLDOWN
+#define ROCKBLOX_ROTATE_CW BUTTON_VOLUP
#define ROCKBLOX_DOWN BUTTON_STOP
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -265,8 +265,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define ROCKBLOX_OFF BUTTON_BACK
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_PLAY
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_PLAY
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -276,8 +276,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP
+#define ROCKBLOX_ROTATE_CCW BUTTON_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
#define ROCKBLOX_ROTATE BUTTON_UP
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT
@@ -288,8 +288,8 @@ PLUGIN_HEADER
# elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
#define ROCKBLOX_OFF BUTTON_POWER
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN
-#define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP
+#define ROCKBLOX_ROTATE_CCW BUTTON_VOL_DOWN
+#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP
#define ROCKBLOX_ROTATE BUTTON_UP
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_PREV
@@ -306,8 +306,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
#define ROCKBLOX_OFF (BUTTON_REC|BUTTON_PLAY)
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
-#define ROCKBLOX_ROTATE_LEFT BUTTON_DOWN
+#define ROCKBLOX_ROTATE_CCW BUTTON_UP
+#define ROCKBLOX_ROTATE_CW BUTTON_DOWN
#define ROCKBLOX_DOWN BUTTON_REW
#define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
@@ -317,8 +317,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
#define ROCKBLOX_OFF BUTTON_REC
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_PLAY
-#define ROCKBLOX_ROTATE_LEFT BUTTON_MENU
+#define ROCKBLOX_ROTATE_CCW BUTTON_PLAY
+#define ROCKBLOX_ROTATE_CW BUTTON_MENU
#define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_PREV
#define ROCKBLOX_RIGHT BUTTON_NEXT
@@ -333,11 +333,15 @@ PLUGIN_HEADER
#ifndef ROCKBLOX_OFF
#define ROCKBLOX_OFF BUTTON_TOPLEFT
#endif
-#ifndef ROCKBLOX_ROTATE_RIGHT
-#define ROCKBLOX_ROTATE_RIGHT BUTTON_BOTTOMRIGHT
+#ifdef ROCKBLOX_ROTATE_CCW
+#define ROCKBLOX_ROTATE_CCW2 BUTTON_BOTTOMRIGHT
+#else
+#define ROCKBLOX_ROTATE_CCW BUTTON_BOTTOMRIGHT
#endif
-#ifndef ROCKBLOX_ROTATE_LEFT
-#define ROCKBLOX_ROTATE_LEFT BUTTON_BOTTOMLEFT
+#ifdef ROCKBLOX_ROTATE_CW
+#define ROCKBLOX_ROTATE_CW2 BUTTON_BOTTOMLEFT
+#else
+#define ROCKBLOX_ROTATE_CW BUTTON_BOTTOMLEFT
#endif
#ifndef ROCKBLOX_DOWN
#define ROCKBLOX_DOWN BUTTON_BOTTOMMIDDLE
@@ -1358,8 +1362,8 @@ static int rockblox_loop (void)
#if defined(ROCKBLOX_ROTATE)
case ROCKBLOX_ROTATE:
#endif
- case ROCKBLOX_ROTATE_RIGHT:
- case ROCKBLOX_ROTATE_RIGHT | BUTTON_REPEAT:
+ case ROCKBLOX_ROTATE_CCW:
+ case ROCKBLOX_ROTATE_CCW | BUTTON_REPEAT:
#ifdef HAVE_SCROLLWHEEL
/* if the wheel is disabled, add an event to the stack. */
if(wheel_enabled == false)
@@ -1371,8 +1375,8 @@ static int rockblox_loop (void)
move_block (0, 0, (rockblox_status.co + 1) % figures[rockblox_status.cf].max_or);
break;
- case ROCKBLOX_ROTATE_LEFT:
- case ROCKBLOX_ROTATE_LEFT | BUTTON_REPEAT:
+ case ROCKBLOX_ROTATE_CW:
+ case ROCKBLOX_ROTATE_CW | BUTTON_REPEAT:
#ifdef HAVE_SCROLLWHEEL
if(wheel_enabled == false)
wheel_events++;
@@ -1384,8 +1388,8 @@ static int rockblox_loop (void)
1) % figures[rockblox_status.cf].max_or);
break;
-#ifdef ROCKBLOX_ROTATE_RIGHT2
- case ROCKBLOX_ROTATE_RIGHT2:
+#ifdef ROCKBLOX_ROTATE_CCW2
+ case ROCKBLOX_ROTATE_CCW2:
move_block (0, 0, (rockblox_status.co + 1) % figures[rockblox_status.cf].max_or);
break;
#endif