mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-07-01 20:57:23 +02:00
parent f513e1fac2
commit 9596c7b3c4
12 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_cbs_cancel.c
View File

@ -69,7 +69,7 @@ static int menu_cbs_init_bind_cancel_compare_type(
int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *menu_label,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return -1;

2
menu/cbs/menu_cbs_deferred_push.c
View File

@ -1110,7 +1110,7 @@ static int menu_cbs_init_bind_deferred_push_compare_type(
int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return -1;

2
menu/cbs/menu_cbs_down.c
View File

@ -42,7 +42,7 @@ static int action_bind_down_generic(unsigned type, const char *label)
int menu_cbs_init_bind_down(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return -1;

11
menu/cbs/menu_cbs_left.c
View File

@ -385,8 +385,7 @@ static int bind_left_generic(unsigned type, const char *label,
}
static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
const char *label, uint32_t label_hash, const char *menu_label,
uint32_t menu_label_hash)
const char *label, uint32_t label_hash, const char *menu_label)
{
unsigned i;
@ -498,7 +497,7 @@ static int menu_cbs_init_bind_left_compare_label(menu_file_list_cbs_t *cbs,
}
static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
unsigned type, uint32_t label_hash, const char *menu_label, uint32_t menu_label_hash)
unsigned type, uint32_t label_hash, const char *menu_label)
{
if (type >= MENU_SETTINGS_CHEAT_BEGIN
&& type <= MENU_SETTINGS_CHEAT_END)
@ -596,7 +595,7 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *menu_label,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return -1;
@ -618,10 +617,10 @@ int menu_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
}
}
if (menu_cbs_init_bind_left_compare_label(cbs, label, label_hash, menu_label, menu_label_hash) == 0)
if (menu_cbs_init_bind_left_compare_label(cbs, label, label_hash, menu_label) == 0)
return 0;
if (menu_cbs_init_bind_left_compare_type(cbs, type, label_hash, menu_label, menu_label_hash) == 0)
if (menu_cbs_init_bind_left_compare_type(cbs, type, label_hash, menu_label) == 0)
return 0;
return -1;

14
menu/cbs/menu_cbs_right.c
View File

@ -407,8 +407,7 @@ int bind_right_generic(unsigned type, const char *label,
}
static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
unsigned type, uint32_t label_hash, const char *menu_label,
uint32_t menu_label_hash)
unsigned type, uint32_t label_hash, const char *menu_label)
{
if (type >= MENU_SETTINGS_CHEAT_BEGIN
&& type <= MENU_SETTINGS_CHEAT_END)
@ -505,8 +504,7 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
}
static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
const char *label, uint32_t label_hash, const char *menu_label,
uint32_t menu_label_hash)
const char *label, uint32_t label_hash, const char *menu_label)
{
unsigned i;
@ -619,7 +617,7 @@ static int menu_cbs_init_bind_right_compare_label(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *menu_label,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return menu_cbs_exit();
@ -641,11 +639,11 @@ int menu_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
}
}
if (menu_cbs_init_bind_right_compare_label(cbs, label, label_hash, menu_label,
menu_label_hash) == 0)
if (menu_cbs_init_bind_right_compare_label(cbs, label, label_hash, menu_label
) == 0)
return 0;
if (menu_cbs_init_bind_right_compare_type(cbs, type, label_hash, menu_label, menu_label_hash) == 0)
if (menu_cbs_init_bind_right_compare_type(cbs, type, label_hash, menu_label ) == 0)
return 0;
return menu_cbs_exit();

2
menu/cbs/menu_cbs_scan.c
View File

@ -135,7 +135,7 @@ static int menu_cbs_init_bind_scan_compare_type(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_scan(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return -1;

2
menu/cbs/menu_cbs_select.c
View File

@ -186,7 +186,7 @@ static int menu_cbs_init_bind_select_compare_label(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return -1;

2
menu/cbs/menu_cbs_start.c
View File

@ -433,7 +433,7 @@ static int menu_cbs_init_bind_start_compare_type(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return -1;

2
menu/cbs/menu_cbs_title.c
View File

@ -1343,7 +1343,7 @@ static int menu_cbs_init_bind_title_compare_type(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return -1;

2
menu/cbs/menu_cbs_up.c
View File

@ -42,7 +42,7 @@ static int action_bind_up_generic(unsigned type, const char *label)
int menu_cbs_init_bind_up(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash)
{
if (!cbs)
return -1;

20
menu/menu_cbs.c
View File

@ -70,19 +70,19 @@ void menu_cbs_init(void *data,
menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident);
menu_cbs_init_bind_cancel(cbs, path, label, type, idx, menu_label, label_hash, menu_label_hash);
menu_cbs_init_bind_cancel(cbs, path, label, type, idx, menu_label, label_hash);
menu_cbs_init_log(repr_label, "CANCEL", cbs->action_cancel_ident);
menu_cbs_init_bind_scan(cbs, path, label, type, idx, label_hash, menu_label_hash);
menu_cbs_init_bind_scan(cbs, path, label, type, idx, label_hash);
menu_cbs_init_log(repr_label, "SCAN", cbs->action_scan_ident);
menu_cbs_init_bind_start(cbs, path, label, type, idx, label_hash, menu_label_hash);
menu_cbs_init_bind_start(cbs, path, label, type, idx, label_hash);
menu_cbs_init_log(repr_label, "START", cbs->action_start_ident);
menu_cbs_init_bind_select(cbs, path, label, type, idx, label_hash, menu_label_hash);
menu_cbs_init_bind_select(cbs, path, label, type, idx, label_hash);
menu_cbs_init_log(repr_label, "SELECT", cbs->action_select_ident);
@ -94,23 +94,23 @@ void menu_cbs_init(void *data,
menu_cbs_init_log(repr_label, "CONTENT SWITCH", cbs->action_content_list_switch_ident);
menu_cbs_init_bind_up(cbs, path, label, type, idx, label_hash, menu_label_hash);
menu_cbs_init_bind_up(cbs, path, label, type, idx, label_hash);
menu_cbs_init_log(repr_label, "UP", cbs->action_up_ident);
menu_cbs_init_bind_down(cbs, path, label, type, idx, label_hash, menu_label_hash);
menu_cbs_init_bind_down(cbs, path, label, type, idx, label_hash);
menu_cbs_init_log(repr_label, "DOWN", cbs->action_down_ident);
menu_cbs_init_bind_left(cbs, path, label, type, idx, menu_label, label_hash, menu_label_hash);
menu_cbs_init_bind_left(cbs, path, label, type, idx, menu_label, label_hash);
menu_cbs_init_log(repr_label, "LEFT", cbs->action_left_ident);
menu_cbs_init_bind_right(cbs, path, label, type, idx, menu_label, label_hash, menu_label_hash);
menu_cbs_init_bind_right(cbs, path, label, type, idx, menu_label, label_hash);
menu_cbs_init_log(repr_label, "RIGHT", cbs->action_right_ident);
menu_cbs_init_bind_deferred_push(cbs, path, label, type, idx, label_hash, menu_label_hash);
menu_cbs_init_bind_deferred_push(cbs, path, label, type, idx, label_hash);
menu_cbs_init_log(repr_label, "DEFERRED PUSH", cbs->action_deferred_push_ident);
@ -122,7 +122,7 @@ void menu_cbs_init(void *data,
menu_cbs_init_log(repr_label, "GET VALUE", cbs->action_get_value_ident);
menu_cbs_init_bind_title(cbs, path, label, type, idx, label_hash, menu_label_hash);
menu_cbs_init_bind_title(cbs, path, label, type, idx, label_hash);
menu_cbs_init_log(repr_label, "GET TITLE", cbs->action_get_title_ident);

20
menu/menu_cbs.h
View File

@ -118,12 +118,12 @@ int action_right_cheat(unsigned type, const char *label,
int menu_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *menu_label,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
int menu_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *menu_label,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
int menu_cbs_init_bind_refresh(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx);
@ -134,18 +134,18 @@ int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_up(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
int menu_cbs_init_bind_down(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx);
int menu_cbs_init_bind_start(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
int menu_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx);
@ -153,7 +153,7 @@ int menu_cbs_init_bind_content_list_switch(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *menu_label,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
@ -161,19 +161,19 @@ int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
int menu_cbs_init_bind_scan(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash);
#ifdef HAVE_LIBRETRODB
int action_scan_directory(const char *path,