CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-01-31 08:33:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor menu_entries_pop_stack

Browse Source
This commit is contained in:
twinaphex 2014-10-17 20:55:41 +02:00
parent 2de0775213
commit b4cebd605e
5 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/menu/menu_entries.c
View File

@ -426,25 +426,6 @@ void menu_flush_stack_type(file_list_t *list,
}
}
void menu_entries_pop_stack(file_list_t *list,
const char *needle)
{
const char *path = NULL;
const char *label = NULL;
unsigned type = 0;
if (!driver.menu || !list)
return;
driver.menu->need_refresh = true;
file_list_get_last(list, &path, &label, &type);
while (strcmp(needle, label) == 0)
{
menu_list_pop(list, &driver.menu->selection_ptr);
file_list_get_last(list, &path, &label, &type);
}
}
void menu_flush_stack_label(file_list_t *list,
const char *needle)
{

2
frontend/menu/menu_entries.h
View File

@ -36,8 +36,6 @@ int menu_entries_parse_list(file_list_t *list, file_list_t *menu_list,
int menu_entries_deferred_push(file_list_t *list, file_list_t *menu_list);
void menu_entries_pop_stack(file_list_t *list, const char *needle);
void menu_flush_stack_type(file_list_t *list, unsigned final_type);
void menu_flush_stack_label(file_list_t *list, const char *needle);

6
frontend/menu/menu_entries_cbs.c
View File

@ -256,7 +256,7 @@ static int action_ok_path_use_directory(const char *path,
if (setting->type == ST_DIR)
{
menu_action_setting_set_current_string(setting, menu_path);
menu_entries_pop_stack(driver.menu->menu_stack, setting->name);
menu_list_pop_stack_by_needle(driver.menu->menu_stack, setting->name);
}
return 0;
@ -448,7 +448,7 @@ static int action_ok_file_load(const char *path,
if (setting && setting->type == ST_PATH)
{
menu_action_setting_set_current_string_path(setting, menu_path, path);
menu_entries_pop_stack(driver.menu->menu_stack, setting->name);
menu_list_pop_stack_by_needle(driver.menu->menu_stack, setting->name);
}
else
{
@ -489,7 +489,7 @@ static int action_ok_set_path(const char *path,
return -1;
menu_action_setting_set_current_string_path(setting, menu_path, path);
menu_entries_pop_stack(driver.menu->menu_stack, setting->name);
menu_list_pop_stack_by_needle(driver.menu->menu_stack, setting->name);
return 0;
}

20
frontend/menu/menu_list.c
View File

@ -15,6 +15,7 @@
#include "../../driver.h"
#include "menu_list.h"
#include <string.h>
void menu_list_free(file_list_t *list)
{
@ -49,6 +50,25 @@ void menu_list_pop_stack(file_list_t *list)
}
}
void menu_list_pop_stack_by_needle(file_list_t *list,
const char *needle)
{
const char *path = NULL;
const char *label = NULL;
unsigned type = 0;
if (!driver.menu || !list)
return;
driver.menu->need_refresh = true;
file_list_get_last(list, &path, &label, &type);
while (strcmp(needle, label) == 0)
{
menu_list_pop(list, &driver.menu->selection_ptr);
file_list_get_last(list, &path, &label, &type);
}
}
void menu_list_pop(file_list_t *list, size_t *directory_ptr)
{
if (!driver.menu_ctx)

3
frontend/menu/menu_list.h
View File

@ -29,6 +29,9 @@ void menu_list_pop(file_list_t *list, size_t *directory_ptr);
void menu_list_pop_stack(file_list_t *list);
void menu_list_pop_stack_by_needle(file_list_t *list,
const char *needle);
void menu_list_clear(file_list_t *list);
void menu_list_push(file_list_t *list,