1 files changed, 0 insertions, 39 deletions
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index e5b48c2f6a..c580074d5e 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -51,16 +51,6 @@ const struct button_mapping pla_remote_ctx[] =
    { PLA_DOWN_REPEAT,       BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE},
    { PLA_LEFT_REPEAT,       BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE},
    { PLA_RIGHT_REPEAT,      BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE},
-#elif (CONFIG_KEYPAD == PLAYER_PAD) || \
-      (CONFIG_KEYPAD == RECORDER_PAD)
-    { PLA_UP,                BUTTON_RC_VOL_UP,                 BUTTON_NONE},
-    { PLA_DOWN,              BUTTON_RC_VOL_DOWN,               BUTTON_NONE},
-    { PLA_LEFT,              BUTTON_RC_LEFT,                   BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RC_RIGHT,                  BUTTON_NONE},
-    { PLA_UP_REPEAT,         BUTTON_RC_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE},
-    { PLA_DOWN_REPEAT,       BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_RC_LEFT|BUTTON_REPEAT,     BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RC_RIGHT|BUTTON_REPEAT,    BUTTON_NONE},
 #elif (CONFIG_REMOTE_KEYPAD == MROBE_REMOTE)
    { PLA_UP,                BUTTON_RC_PLAY,                   BUTTON_NONE},
    { PLA_DOWN,              BUTTON_RC_DOWN,                   BUTTON_NONE},
@@ -101,9 +91,7 @@ const struct button_mapping pla_main_ctx[] =
    || (CONFIG_KEYPAD == IRIVER_H300_PAD)   \
    || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)     \
    || (CONFIG_KEYPAD == GIGABEAT_PAD)      \
-    || (CONFIG_KEYPAD == RECORDER_PAD)      \
    || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \
-    || (CONFIG_KEYPAD == ONDIO_PAD) \
    || (CONFIG_KEYPAD == SANSA_C200_PAD) \
    || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \
    || (CONFIG_KEYPAD == MROBE100_PAD) \
@@ -145,15 +133,6 @@ const struct button_mapping pla_main_ctx[] =
    { PLA_DOWN_REPEAT,      BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE },
    { PLA_LEFT_REPEAT,      BUTTON_LEFT|BUTTON_REPEAT,          BUTTON_NONE },
    { PLA_RIGHT_REPEAT,     BUTTON_RIGHT|BUTTON_REPEAT,         BUTTON_NONE },
-#elif (CONFIG_KEYPAD == PLAYER_PAD)
-    { PLA_UP,               BUTTON_PLAY,                        BUTTON_NONE },
-    { PLA_DOWN,             BUTTON_STOP,                        BUTTON_NONE },
-    { PLA_LEFT,             BUTTON_LEFT,                        BUTTON_NONE },
-    { PLA_RIGHT,            BUTTON_RIGHT,                       BUTTON_NONE },
-    { PLA_UP_REPEAT,        BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE },
-    { PLA_DOWN_REPEAT,      BUTTON_STOP|BUTTON_REPEAT,          BUTTON_NONE },
-    { PLA_LEFT_REPEAT,      BUTTON_LEFT|BUTTON_REPEAT,          BUTTON_NONE },
-    { PLA_RIGHT_REPEAT,     BUTTON_RIGHT|BUTTON_REPEAT,         BUTTON_NONE },
 #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
    { PLA_UP,               BUTTON_SCROLL_UP,                   BUTTON_NONE },
    { PLA_DOWN,             BUTTON_SCROLL_DOWN,                 BUTTON_NONE },
@@ -339,24 +318,6 @@ const struct button_mapping pla_main_ctx[] =
    {PLA_SELECT,            BUTTON_SELECT,                      BUTTON_NONE},
    {PLA_SELECT_REL,        BUTTON_SELECT|BUTTON_REL,           BUTTON_SELECT},
    {PLA_SELECT_REPEAT,     BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_NONE},
-#elif (CONFIG_KEYPAD == RECORDER_PAD)
-    {PLA_CANCEL,            BUTTON_ON,                          BUTTON_NONE},
-    {PLA_EXIT,              BUTTON_OFF,                         BUTTON_NONE},
-    {PLA_SELECT,            BUTTON_PLAY,                        BUTTON_NONE},
-    {PLA_SELECT_REL,        BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
-    {PLA_SELECT_REPEAT,     BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_NONE},
-#elif (CONFIG_KEYPAD == ONDIO_PAD)
-    {PLA_CANCEL,            BUTTON_OFF|BUTTON_REL,              BUTTON_OFF},
-    {PLA_EXIT,              BUTTON_OFF|BUTTON_REPEAT,           BUTTON_NONE},
-    {PLA_SELECT,            BUTTON_MENU,                        BUTTON_NONE},
-    {PLA_SELECT_REL,        BUTTON_MENU|BUTTON_REL,             BUTTON_MENU},
-    {PLA_SELECT_REPEAT,     BUTTON_MENU|BUTTON_REPEAT,          BUTTON_NONE},
-#elif (CONFIG_KEYPAD == PLAYER_PAD)
-    {PLA_CANCEL,            BUTTON_MENU|BUTTON_REL,             BUTTON_MENU},
-    {PLA_EXIT,              BUTTON_MENU|BUTTON_REPEAT,          BUTTON_NONE},
-    {PLA_SELECT,            BUTTON_ON,                          BUTTON_NONE},
-    {PLA_SELECT_REL,        BUTTON_ON|BUTTON_REL,               BUTTON_ON},
-    {PLA_SELECT_REPEAT,     BUTTON_ON|BUTTON_REPEAT,            BUTTON_NONE},
 #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
    {PLA_CANCEL,            BUTTON_HOME|BUTTON_REL,             BUTTON_HOME},
    {PLA_EXIT,              BUTTON_HOME|BUTTON_REPEAT,          BUTTON_NONE},

diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index e5b48c2f6a..c580074d5e 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c
@@ -51,16 +51,6 @@ const struct button_mapping pla_remote_ctx[] =
51	{ PLA_DOWN_REPEAT, BUTTON_RC_REW\|BUTTON_REPEAT, BUTTON_NONE},	51	{ PLA_DOWN_REPEAT, BUTTON_RC_REW\|BUTTON_REPEAT, BUTTON_NONE},
52	{ PLA_LEFT_REPEAT, BUTTON_RC_VOL_DOWN\|BUTTON_REPEAT, BUTTON_NONE},	52	{ PLA_LEFT_REPEAT, BUTTON_RC_VOL_DOWN\|BUTTON_REPEAT, BUTTON_NONE},
53	{ PLA_RIGHT_REPEAT, BUTTON_RC_VOL_UP\|BUTTON_REPEAT, BUTTON_NONE},	53	{ PLA_RIGHT_REPEAT, BUTTON_RC_VOL_UP\|BUTTON_REPEAT, BUTTON_NONE},
54	#elif (CONFIG_KEYPAD == PLAYER_PAD) \|\| \
55	(CONFIG_KEYPAD == RECORDER_PAD)
56	{ PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE},
57	{ PLA_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE},
58	{ PLA_LEFT, BUTTON_RC_LEFT, BUTTON_NONE},
59	{ PLA_RIGHT, BUTTON_RC_RIGHT, BUTTON_NONE},
60	{ PLA_UP_REPEAT, BUTTON_RC_VOL_UP\|BUTTON_REPEAT, BUTTON_NONE},
61	{ PLA_DOWN_REPEAT, BUTTON_RC_VOL_DOWN\|BUTTON_REPEAT, BUTTON_NONE},
62	{ PLA_LEFT_REPEAT, BUTTON_RC_LEFT\|BUTTON_REPEAT, BUTTON_NONE},
63	{ PLA_RIGHT_REPEAT, BUTTON_RC_RIGHT\|BUTTON_REPEAT, BUTTON_NONE},
64	#elif (CONFIG_REMOTE_KEYPAD == MROBE_REMOTE)	54	#elif (CONFIG_REMOTE_KEYPAD == MROBE_REMOTE)
65	{ PLA_UP, BUTTON_RC_PLAY, BUTTON_NONE},	55	{ PLA_UP, BUTTON_RC_PLAY, BUTTON_NONE},
66	{ PLA_DOWN, BUTTON_RC_DOWN, BUTTON_NONE},	56	{ PLA_DOWN, BUTTON_RC_DOWN, BUTTON_NONE},
@@ -101,9 +91,7 @@ const struct button_mapping pla_main_ctx[] =
101	\|\| (CONFIG_KEYPAD == IRIVER_H300_PAD) \	91	\|\| (CONFIG_KEYPAD == IRIVER_H300_PAD) \
102	\|\| (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \	92	\|\| (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \
103	\|\| (CONFIG_KEYPAD == GIGABEAT_PAD) \	93	\|\| (CONFIG_KEYPAD == GIGABEAT_PAD) \
104	\|\| (CONFIG_KEYPAD == RECORDER_PAD) \
105	\|\| (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \	94	\|\| (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \
106	\|\| (CONFIG_KEYPAD == ONDIO_PAD) \
107	\|\| (CONFIG_KEYPAD == SANSA_C200_PAD) \	95	\|\| (CONFIG_KEYPAD == SANSA_C200_PAD) \
108	\|\| (CONFIG_KEYPAD == GIGABEAT_S_PAD) \	96	\|\| (CONFIG_KEYPAD == GIGABEAT_S_PAD) \
109	\|\| (CONFIG_KEYPAD == MROBE100_PAD) \	97	\|\| (CONFIG_KEYPAD == MROBE100_PAD) \
@@ -145,15 +133,6 @@ const struct button_mapping pla_main_ctx[] =
145	{ PLA_DOWN_REPEAT, BUTTON_PLAY\|BUTTON_REPEAT, BUTTON_NONE },	133	{ PLA_DOWN_REPEAT, BUTTON_PLAY\|BUTTON_REPEAT, BUTTON_NONE },
146	{ PLA_LEFT_REPEAT, BUTTON_LEFT\|BUTTON_REPEAT, BUTTON_NONE },	134	{ PLA_LEFT_REPEAT, BUTTON_LEFT\|BUTTON_REPEAT, BUTTON_NONE },
147	{ PLA_RIGHT_REPEAT, BUTTON_RIGHT\|BUTTON_REPEAT, BUTTON_NONE },	135	{ PLA_RIGHT_REPEAT, BUTTON_RIGHT\|BUTTON_REPEAT, BUTTON_NONE },
148	#elif (CONFIG_KEYPAD == PLAYER_PAD)
149	{ PLA_UP, BUTTON_PLAY, BUTTON_NONE },
150	{ PLA_DOWN, BUTTON_STOP, BUTTON_NONE },
151	{ PLA_LEFT, BUTTON_LEFT, BUTTON_NONE },
152	{ PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
153	{ PLA_UP_REPEAT, BUTTON_PLAY\|BUTTON_REPEAT, BUTTON_NONE },
154	{ PLA_DOWN_REPEAT, BUTTON_STOP\|BUTTON_REPEAT, BUTTON_NONE },
155	{ PLA_LEFT_REPEAT, BUTTON_LEFT\|BUTTON_REPEAT, BUTTON_NONE },
156	{ PLA_RIGHT_REPEAT, BUTTON_RIGHT\|BUTTON_REPEAT, BUTTON_NONE },
157	#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)	136	#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
158	{ PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE },	137	{ PLA_UP, BUTTON_SCROLL_UP, BUTTON_NONE },
159	{ PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },	138	{ PLA_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },
@@ -339,24 +318,6 @@ const struct button_mapping pla_main_ctx[] =
339	{PLA_SELECT, BUTTON_SELECT, BUTTON_NONE},	318	{PLA_SELECT, BUTTON_SELECT, BUTTON_NONE},
340	{PLA_SELECT_REL, BUTTON_SELECT\|BUTTON_REL, BUTTON_SELECT},	319	{PLA_SELECT_REL, BUTTON_SELECT\|BUTTON_REL, BUTTON_SELECT},
341	{PLA_SELECT_REPEAT, BUTTON_SELECT\|BUTTON_REPEAT, BUTTON_NONE},	320	{PLA_SELECT_REPEAT, BUTTON_SELECT\|BUTTON_REPEAT, BUTTON_NONE},
342	#elif (CONFIG_KEYPAD == RECORDER_PAD)
343	{PLA_CANCEL, BUTTON_ON, BUTTON_NONE},
344	{PLA_EXIT, BUTTON_OFF, BUTTON_NONE},
345	{PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},
346	{PLA_SELECT_REL, BUTTON_PLAY\|BUTTON_REL, BUTTON_PLAY},
347	{PLA_SELECT_REPEAT, BUTTON_PLAY\|BUTTON_REPEAT, BUTTON_NONE},
348	#elif (CONFIG_KEYPAD == ONDIO_PAD)
349	{PLA_CANCEL, BUTTON_OFF\|BUTTON_REL, BUTTON_OFF},
350	{PLA_EXIT, BUTTON_OFF\|BUTTON_REPEAT, BUTTON_NONE},
351	{PLA_SELECT, BUTTON_MENU, BUTTON_NONE},
352	{PLA_SELECT_REL, BUTTON_MENU\|BUTTON_REL, BUTTON_MENU},
353	{PLA_SELECT_REPEAT, BUTTON_MENU\|BUTTON_REPEAT, BUTTON_NONE},
354	#elif (CONFIG_KEYPAD == PLAYER_PAD)
355	{PLA_CANCEL, BUTTON_MENU\|BUTTON_REL, BUTTON_MENU},
356	{PLA_EXIT, BUTTON_MENU\|BUTTON_REPEAT, BUTTON_NONE},
357	{PLA_SELECT, BUTTON_ON, BUTTON_NONE},
358	{PLA_SELECT_REL, BUTTON_ON\|BUTTON_REL, BUTTON_ON},
359	{PLA_SELECT_REPEAT, BUTTON_ON\|BUTTON_REPEAT, BUTTON_NONE},
360	#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)	321	#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
361	{PLA_CANCEL, BUTTON_HOME\|BUTTON_REL, BUTTON_HOME},	322	{PLA_CANCEL, BUTTON_HOME\|BUTTON_REL, BUTTON_HOME},
362	{PLA_EXIT, BUTTON_HOME\|BUTTON_REPEAT, BUTTON_NONE},	323	{PLA_EXIT, BUTTON_HOME\|BUTTON_REPEAT, BUTTON_NONE},