ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Menu) Remove dependency on General Settings enum

This commit is contained in:
twinaphex 2014-08-31 19:47:45 +02:00
parent e649ae80ed
commit 3e7fb6d1e1
5 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
driver_menu.h
View File

@ -155,7 +155,8 @@ typedef struct menu_ctx_driver
void (*free)(void*);
void (*context_reset)(void*);
void (*context_destroy)(void*);
void (*populate_entries)(void*, const char *, unsigned);
void (*populate_entries)(void*, const char *, const char *,
unsigned);
void (*iterate)(void*, unsigned);
int (*input_postprocess)(uint64_t);
void (*navigation_clear)(void *);

6
frontend/menu/disp/rgui.c
View File

@ -293,6 +293,10 @@ static void rgui_render(void)
if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->type_is)
menu_type_is = driver.menu_ctx->backend->type_is(menu_type);
#if 0
RARCH_LOG("Dir is: %s\n", dir);
#endif
if (menu_type == MENU_SETTINGS_CORE)
snprintf(title, sizeof(title), "CORE SELECTION %s", dir);
else if (menu_type == MENU_SETTINGS_DEFERRED_CORE)
@ -335,7 +339,7 @@ static void rgui_render(void)
#endif
else if (menu_type == MENU_SETTINGS_FONT_OPTIONS)
strlcpy(title, "FONT OPTIONS", sizeof(title));
else if (menu_type == MENU_SETTINGS_GENERAL_OPTIONS)
else if (!strcmp(dir, "General Options"))
strlcpy(title, "GENERAL OPTIONS", sizeof(title));
else if (menu_type == MENU_SETTINGS_AUDIO_OPTIONS)
strlcpy(title, "AUDIO OPTIONS", sizeof(title));

2
frontend/menu/disp/rmenu.c
View File

@ -194,7 +194,7 @@ static void rmenu_render(void)
strlcpy(title, "USER OPTIONS", sizeof(title));
else if (menu_type == MENU_SETTINGS_FONT_OPTIONS)
strlcpy(title, "FONT OPTIONS", sizeof(title));
else if (menu_type == MENU_SETTINGS_GENERAL_OPTIONS)
else if (!strcmp(dir, "General Options"))
strlcpy(title, "GENERAL OPTIONS", sizeof(title));
else if (menu_type == MENU_SETTINGS_PATH_OPTIONS)
strlcpy(title, "PATH OPTIONS", sizeof(title));

7
frontend/menu/disp/rmenu_xui.cpp
View File

@ -433,7 +433,7 @@ static void rmenu_xui_render(void)
#endif
else if (menu_type == MENU_SETTINGS_FONT_OPTIONS)
strlcpy(title, "FONT OPTIONS", sizeof(title));
else if (menu_type == MENU_SETTINGS_GENERAL_OPTIONS)
else if (!strcmp(dir, "General Options"))
strlcpy(title, "GENERAL OPTIONS", sizeof(title));
else if (menu_type == MENU_SETTINGS_AUDIO_OPTIONS)
strlcpy(title, "AUDIO OPTIONS", sizeof(title));
@ -669,11 +669,12 @@ static void rmenu_xui_render(void)
}
}
static void rmenu_xui_populate_entries(void *data, const char *label,
unsigned i)
static void rmenu_xui_populate_entries(void *data, const char *path,
const char *label, unsigned i)
{
menu_handle_t *menu = (menu_handle_t*)data;
(void)label;
(void)path;
XuiListSetCurSelVisible(m_menulist, menu->selection_ptr);
}

47
frontend/menu/menu_entries.c
View File

@ -76,6 +76,29 @@ void menu_entries_push(menu_handle_t *menu,
add_setting_entry(menu,"help", 0, setting_data);
add_setting_entry(menu,"quit_retroarch", 0, setting_data);
}
else if (!strcmp(path, "General Options"))
{
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"libretro_log_level", 0, setting_data);
add_setting_entry(menu,"log_verbosity", 0, setting_data);
add_setting_entry(menu,"perfcnt_enable", 0, setting_data);
add_setting_entry(menu,"game_history_size", 0, setting_data);
add_setting_entry(menu,"config_save_on_exit", 0, setting_data);
add_setting_entry(menu,"core_specific_config", 0, setting_data);
add_setting_entry(menu,"video_gpu_screenshot", 0, setting_data);
add_setting_entry(menu,"dummy_on_core_shutdown", 0, setting_data);
add_setting_entry(menu,"fps_show", 0, setting_data);
add_setting_entry(menu,"fastforward_ratio", 0, setting_data);
add_setting_entry(menu,"slowmotion_ratio", 0, setting_data);
add_setting_entry(menu,"rewind_enable", 0, setting_data);
add_setting_entry(menu,"rewind_granularity", 0, setting_data);
add_setting_entry(menu,"block_sram_overwrite", 0, setting_data);
add_setting_entry(menu,"autosave_interval", 0, setting_data);
add_setting_entry(menu,"video_disable_composition", 0, setting_data);
add_setting_entry(menu,"pause_nonactive", 0, setting_data);
add_setting_entry(menu,"savestate_auto_save", 0, setting_data);
add_setting_entry(menu,"savestate_auto_load", 0, setting_data);
}
else
{
switch (menu_type)
@ -137,28 +160,6 @@ void menu_entries_push(menu_handle_t *menu,
}
}
break;
case MENU_SETTINGS_GENERAL_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"libretro_log_level", 0, setting_data);
add_setting_entry(menu,"log_verbosity", 0, setting_data);
add_setting_entry(menu,"perfcnt_enable", 0, setting_data);
add_setting_entry(menu,"game_history_size", 0, setting_data);
add_setting_entry(menu,"config_save_on_exit", 0, setting_data);
add_setting_entry(menu,"core_specific_config", 0, setting_data);
add_setting_entry(menu,"video_gpu_screenshot", 0, setting_data);
add_setting_entry(menu,"dummy_on_core_shutdown", 0, setting_data);
add_setting_entry(menu,"fps_show", 0, setting_data);
add_setting_entry(menu,"fastforward_ratio", 0, setting_data);
add_setting_entry(menu,"slowmotion_ratio", 0, setting_data);
add_setting_entry(menu,"rewind_enable", 0, setting_data);
add_setting_entry(menu,"rewind_granularity", 0, setting_data);
add_setting_entry(menu,"block_sram_overwrite", 0, setting_data);
add_setting_entry(menu,"autosave_interval", 0, setting_data);
add_setting_entry(menu,"video_disable_composition", 0, setting_data);
add_setting_entry(menu,"pause_nonactive", 0, setting_data);
add_setting_entry(menu,"savestate_auto_save", 0, setting_data);
add_setting_entry(menu,"savestate_auto_load", 0, setting_data);
break;
case MENU_SETTINGS_VIDEO_OPTIONS:
file_list_clear(menu->selection_buf);
add_setting_entry(menu,"video_shared_context", 0, setting_data);
@ -481,5 +482,5 @@ void menu_entries_push(menu_handle_t *menu,
}
if (driver.menu_ctx && driver.menu_ctx->populate_entries)
driver.menu_ctx->populate_entries(menu, label, menu_type);
driver.menu_ctx->populate_entries(menu, path, label, menu_type);
}