menu adjustments (L, R for range controls)

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@723 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/platform/common/menu.c b/platform/common/menu.c
index 80fdff8..97c22e3 100644 (file)
--- a/platform/common/menu.c
+++ b/platform/common/menu.c
@@ -455,8 +455,9 @@ static void me_draw(const menu_entry *entries, int sel, void (*draw_more)(void))
        plat_video_menu_end();\r
 }\r
 \r
-static int me_process(menu_entry *entry, int is_next)\r
+static int me_process(menu_entry *entry, int is_next, int is_lr)\r
 {\r
+       int c;\r
        switch (entry->beh)\r
        {\r
                case MB_OPT_ONOFF:\r
@@ -465,7 +466,8 @@ static int me_process(menu_entry *entry, int is_next)
                        return 1;\r
                case MB_OPT_RANGE:\r
                case MB_OPT_CUSTRANGE:\r
-                       *(int *)entry->var += is_next ? 1 : -1;\r
+                       c = is_lr ? 10 : 1;\r
+                       *(int *)entry->var += is_next ? c : -c;\r
                        if (*(int *)entry->var < (int)entry->min)\r
                                *(int *)entry->var = (int)entry->max;\r
                        if (*(int *)entry->var > (int)entry->max)\r
@@ -524,8 +526,9 @@ static void me_loop(menu_entry *menu, int *menu_sel, void (*draw_more)(void))
                if ((inp & (PBTN_L|PBTN_R)) == (PBTN_L|PBTN_R))\r
                        debug_menu_loop();\r
 \r
-               if (inp & (PBTN_LEFT|PBTN_RIGHT)) { /* multi choice */\r
-                       if (me_process(&menu[sel], (inp & PBTN_RIGHT) ? 1 : 0))\r
+               if (inp & (PBTN_LEFT|PBTN_RIGHT|PBTN_L|PBTN_R)) { /* multi choice */\r
+                       if (me_process(&menu[sel], (inp & (PBTN_RIGHT|PBTN_R)) ? 1 : 0,\r
+                                               inp & (PBTN_L|PBTN_R)))\r
                                continue;\r
                }\r
 \r

diff --git a/platform/gp2x/menu.c b/platform/gp2x/menu.c
index c46b294..5500529 100644 (file)
--- a/platform/gp2x/menu.c
+++ b/platform/gp2x/menu.c
@@ -1,4 +1,4 @@
-#ifdef __GP2X_H__
+#ifdef __GP2X__
 
 #include <time.h>
 #include "soc.h"
@@ -103,5 +103,6 @@ static const char *mgn_aopt_gamma(menu_id id, int *offs)
 #define MENU_GP2X_OPTIONS_GFX
 #define MENU_GP2X_OPTIONS_ADV
 #define mgn_opt_renderer NULL /* TODO */
+#define menu_main_plat_draw NULL
 
 #endif