X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Fmenu.h;h=c9be9f2372fffe5ad20898c50d816ea47d46516c;hb=b188c2b6d0448a9c328a9dcae5ba5c8c8b5273f3;hp=c4aaaf00fcf13998752678c22afed4dc01ff2c07;hpb=049a6b3e80151f6a5af726e25478ed15e111dfcc;p=libpicofe.git

diff --git a/common/menu.h b/common/menu.h
index c4aaaf0..c9be9f2 100644
--- a/common/menu.h
+++ b/common/menu.h
@@ -1,11 +1,4 @@
-// (c) Copyright 2006-2008 notaz, All rights reserved.
-
-
-void menu_init(void);
-void text_out16(int x, int y, const char *texto, ...);
-void smalltext_out16(int x, int y, const char *texto, int color);
-
-extern char menuErrorMsg[64];
+// (c) Copyright 2006-2009 notaz, All rights reserved.
 
 typedef enum
 {
@@ -32,7 +25,6 @@ typedef enum
 	MA_MAIN_EXIT,
 	MA_OPT_RENDERER,
 	MA_OPT_SCALING,
-	MA_OPT_ACC_TIMING,
 	MA_OPT_ACC_SPRITES,
 	MA_OPT_SHOW_FPS,
 	MA_OPT_FRAMESKIP,
@@ -53,6 +45,7 @@ typedef enum
 	MA_OPT_LOADCFG,
 	MA_OPT_INTERLACED,	/* giz */
 	MA_OPT_ROTATION,	/* uiq */
+	MA_OPT_TEARING_FIX,	/* wiz */
 	MA_OPT2_GAMMA,
 	MA_OPT2_A_SN_GAMMA,
 	MA_OPT2_DBLBUFF,	/* giz */
@@ -92,6 +85,8 @@ typedef enum
 	MA_CDOPT_SCALEROT_CHIP,
 	MA_CDOPT_BETTER_SYNC,
 	MA_CDOPT_DONE,
+	MA_32XOPT_ENABLE_32X,
+	MA_32XOPT_PWM,
 	MA_CTRL_PLAYER1,
 	MA_CTRL_PLAYER2,
 	MA_CTRL_EMU,
@@ -103,7 +98,7 @@ typedef enum
 
 typedef struct
 {
-	char *name;
+	const char *name;
 	menu_behavior beh;
 	menu_id id;
 	void *var;		/* for on-off/range settings */
@@ -159,8 +154,19 @@ typedef struct
 extern me_bind_action me_ctrl_actions[15];
 extern me_bind_action emuctrl_actions[];	// platform code
 
+extern void *g_menubg_ptr;
+
+void menu_init(void);
+void menu_plat_setup(int is_wiz);
+void text_out16(int x, int y, const char *texto, ...);
+void me_update_msg(const char *msg);
+
+void menu_romload_prepare(const char *rom_name);
+void menu_romload_end(void);
+
+void menu_loop(void);
+int  menu_loop_tray(void);
+
 menu_entry *me_list_get_first(void);
 menu_entry *me_list_get_next(void);
 
-void menu_darken_bg(void *dst, int pixels, int darker);
-