notaz.gp2x.de
/
picodrive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve cd change handling
[picodrive.git]
/
platform
/
common
/
menu.c
diff --git
a/platform/common/menu.c
b/platform/common/menu.c
index
e679f5e
..
44fb5c8
100644
(file)
--- a/
platform/common/menu.c
+++ b/
platform/common/menu.c
@@
-1968,24
+1968,14
@@
void menu_loop(void)
\r
static int mh_tray_load_cd(menu_id id, int keys)
\r
{
\r
\r
static int mh_tray_load_cd(menu_id id, int keys)
\r
{
\r
- cd_img_type cd_type;
\r
char *ret_name;
\r
char *ret_name;
\r
- int ret = -1;
\r
\r
ret_name = romsel_run();
\r
if (ret_name == NULL)
\r
return 0;
\r
\r
\r
ret_name = romsel_run();
\r
if (ret_name == NULL)
\r
return 0;
\r
\r
- cd_type = emu_cd_check(NULL, ret_name);
\r
- if (cd_type != CIT_NOT_CD)
\r
- ret = Insert_CD(ret_name, cd_type);
\r
- if (ret != 0) {
\r
- me_update_msg("Load failed, invalid CD image?");
\r
- return 0;
\r
- }
\r
-
\r
engineState = PGS_RestartRun;
\r
engineState = PGS_RestartRun;
\r
- return
1
;
\r
+ return
emu_swap_cd(ret_name)
;
\r
}
\r
\r
static int mh_tray_nothing(menu_id id, int keys)
\r
}
\r
\r
static int mh_tray_nothing(menu_id id, int keys)
\r
@@
-2001,6
+1991,7
@@
static menu_entry e_menu_tray[] =
mee_label (""),
\r
mee_handler("Load CD image", mh_tray_load_cd),
\r
mee_handler("Insert nothing", mh_tray_nothing),
\r
mee_label (""),
\r
mee_handler("Load CD image", mh_tray_load_cd),
\r
mee_handler("Insert nothing", mh_tray_nothing),
\r
+ mee_end,
\r
};
\r
\r
int menu_loop_tray(void)
\r
};
\r
\r
int menu_loop_tray(void)
\r
@@
-2043,6
+2034,8
@@
void menu_plat_setup(int is_wiz)
\r
if (!is_wiz) {
\r
me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);
\r
\r
if (!is_wiz) {
\r
me_enable(e_menu_gfx_options, MA_OPT_TEARING_FIX, 0);
\r
+ i = me_id2offset(e_menu_gfx_options, MA_OPT_TEARING_FIX);
\r
+ e_menu_gfx_options[i].need_to_save = 0;
\r
return;
\r
}
\r
\r
return;
\r
}
\r
\r
@@
-2052,6
+2045,8
@@
void menu_plat_setup(int is_wiz)
\r
i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);
\r
e_menu_gfx_options[i].max = 1; /* only off and sw */
\r
\r
i = me_id2offset(e_menu_gfx_options, MA_OPT_SCALING);
\r
e_menu_gfx_options[i].max = 1; /* only off and sw */
\r
+ i = me_id2offset(e_menu_gfx_options, MA_OPT_ARM940_SOUND);
\r
+ e_menu_gfx_options[i].need_to_save = 0;
\r
}
\r
\r
/* TODO: rename */
\r
}
\r
\r
/* TODO: rename */
\r