more unification; replace some magic bits to defines

[libpicofe.git] / common / menu.c

diff --git a/common/menu.c b/common/menu.c
index 32bf12f..74e7a6d 100644 (file)
--- a/common/menu.c
+++ b/common/menu.c
@@ -1286,19 +1286,19 @@ me_bind_action me_ctrl_actions[15] =
 // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"\r
 me_bind_action emuctrl_actions[] =\r
 {\r
-       { "Load State       ", 1<<28 },\r
-       { "Save State       ", 1<<27 },\r
-       { "Prev Save Slot   ", 1<<25 },\r
-       { "Next Save Slot   ", 1<<24 },\r
-       { "Switch Renderer  ", 1<<26 },\r
-       { "Volume Down      ", 1<<30 },\r
-       { "Volume Up        ", 1<<29 },\r
-       { "Fast forward     ", 1<<22 },\r
-       { "Enter Menu       ", 1<<23 },\r
-       { "Pico Next page   ", 1<<21 },\r
-       { "Pico Prev page   ", 1<<20 },\r
-       { "Pico Switch input", 1<<19 },\r
-       { NULL,                0     }\r
+       { "Load State       ", 1 << PEVB_STATE_LOAD },\r
+       { "Save State       ", 1 << PEVB_STATE_SAVE },\r
+       { "Prev Save Slot   ", 1 << PEVB_SSLOT_PREV },\r
+       { "Next Save Slot   ", 1 << PEVB_SSLOT_NEXT },\r
+       { "Switch Renderer  ", 1 << PEVB_SWITCH_RND },\r
+       { "Volume Down      ", 1 << PEVB_VOL_DOWN },\r
+       { "Volume Up        ", 1 << PEVB_VOL_UP },\r
+       { "Fast forward     ", 1 << PEVB_FF },\r
+       { "Enter Menu       ", 1 << PEVB_MENU },\r
+       { "Pico Next page   ", 1 << 21 }, /* TODO */\r
+       { "Pico Prev page   ", 1 << 20 },\r
+       { "Pico Switch input", 1 << 19 },\r
+       { NULL,                0 }\r
 };\r
 \r
 static int key_config_loop_wrap(menu_id id, int keys)\r