mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Go through menu_driver_get_ptr

Browse Source
This commit is contained in:
twinaphex 2015-04-14 13:01:33 +02:00
parent a3e9a5c8f9
commit 2cf13d3e0b
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/menu_entries.c
View File

@ -332,6 +332,7 @@ int menu_entries_parse_list(
int device = 0;
struct string_list *str_list = NULL;
settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr();
(void)device;
@ -456,7 +457,7 @@ int menu_entries_parse_list(
{
driver_t *driver = driver_get_ptr();
menu_list_get_last_stack(driver->menu->menu_list, &dir, NULL, NULL);
menu_list_get_last_stack(menu->menu_list, &dir, NULL, NULL);
list_size = file_list_get_size(list);
for (i = 0; i < list_size; i++)
@ -490,18 +491,19 @@ int menu_entries_deferred_push(file_list_t *list, file_list_t *menu_list)
const char *path = NULL;
const char *label = NULL;
menu_file_list_cbs_t *cbs = NULL;
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr();
menu_list_get_last_stack(driver->menu->menu_list, &path, &label, &type);
menu_list_get_last_stack(menu->menu_list, &path, &label, &type);
if (!strcmp(label, "Main Menu"))
return menu_entries_push_list(driver->menu, list, path, label, type,
return menu_entries_push_list(menu, list, path, label, type,
SL_FLAG_MAIN_MENU);
else if (!strcmp(label, "Horizontal Menu"))
return menu_entries_push_horizontal_menu_list(driver->menu, list, path, label, type);
return menu_entries_push_horizontal_menu_list(menu, list, path, label, type);
cbs = (menu_file_list_cbs_t*)
menu_list_get_last_stack_actiondata(driver->menu->menu_list);
menu_list_get_last_stack_actiondata(menu->menu_list);
if (!cbs->action_deferred_push)
return 0;

17
menu/menu_shader.c
View File

@ -127,6 +127,7 @@ void menu_shader_manager_set_preset(struct video_shader *shader,
config_file_t *conf = NULL;
driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
settings->video.shader_enable = false;
@ -162,7 +163,7 @@ void menu_shader_manager_set_preset(struct video_shader *shader,
}
config_file_free(conf);
driver->menu->need_refresh = true;
menu->need_refresh = true;
#endif
}
@ -184,14 +185,15 @@ void menu_shader_manager_save_preset(
driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (!driver->menu)
if (!menu)
{
RARCH_ERR("Cannot save shader preset, menu handle is not initialized.\n");
return;
}
type = menu_shader_manager_get_type(driver->menu->shader);
type = menu_shader_manager_get_type(menu->shader);
if (type == RARCH_SHADER_NONE)
return;
@ -214,7 +216,7 @@ void menu_shader_manager_save_preset(
else
{
const char *conf_path = (type == RARCH_SHADER_GLSL) ?
driver->menu->default_glslp : driver->menu->default_cgp;
menu->default_glslp : menu->default_cgp;
strlcpy(buffer, conf_path, sizeof(buffer));
}
@ -230,7 +232,7 @@ void menu_shader_manager_save_preset(
if (!(conf = (config_file_t*)config_file_new(NULL)))
return;
video_shader_write_conf_cgp(conf, driver->menu->shader);
video_shader_write_conf_cgp(conf, menu->shader);
for (d = 0; d < ARRAY_SIZE(dirs); d++)
{
@ -308,9 +310,10 @@ void menu_shader_manager_apply_changes(void)
{
#ifdef HAVE_SHADER_MANAGER
driver_t *driver = driver_get_ptr();
unsigned shader_type = menu_shader_manager_get_type(driver->menu->shader);
menu_handle_t *menu = menu_driver_get_ptr();
unsigned shader_type = menu_shader_manager_get_type(menu->shader);
if (driver->menu->shader->passes
if (menu->shader->passes
&& shader_type != RARCH_SHADER_NONE)
{
menu_shader_manager_save_preset(NULL, true);