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

Start implementing playlist association callbacks

This commit is contained in:
twinaphex 2015-10-26 07:16:37 +01:00
parent ba88e3a515
commit 1b51882b8a
5 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/cbs/menu_cbs_get_value.c
View File

@ -938,7 +938,11 @@ static void menu_action_setting_disp_set_label(file_list_t* list,
break; break;
} }
if (type >= MENU_SETTINGS_CORE_OPTION_START) if (type >= MENU_SETTINGS_PLAYLIST_ASSOCIATION_START)
{
strlcpy(s, "N/A", len);
}
else if (type >= MENU_SETTINGS_CORE_OPTION_START)
{ {
const char *core_opt = NULL; const char *core_opt = NULL;
if (!system) if (!system)

15
menu/cbs/menu_cbs_left.c
View File

@ -303,6 +303,17 @@ static int action_left_video_resolution(unsigned type, const char *label,
return 0; return 0;
} }
static int playlist_association_left(unsigned type, const char *label,
bool wraparound)
{
unsigned idx = type - MENU_SETTINGS_PLAYLIST_ASSOCIATION_START;
rarch_system_info_t *system = rarch_system_info_get_ptr();
(void)label;
return 0;
}
static int core_setting_left(unsigned type, const char *label, static int core_setting_left(unsigned type, const char *label,
bool wraparound) bool wraparound)
{ {
@ -434,6 +445,10 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
{ {
BIND_ACTION_LEFT(cbs, action_left_input_desc); BIND_ACTION_LEFT(cbs, action_left_input_desc);
} }
else if ((type >= MENU_SETTINGS_PLAYLIST_ASSOCIATION_START))
{
BIND_ACTION_LEFT(cbs, playlist_association_left);
}
else if ((type >= MENU_SETTINGS_CORE_OPTION_START)) else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
{ {
BIND_ACTION_LEFT(cbs, core_setting_left); BIND_ACTION_LEFT(cbs, core_setting_left);

15
menu/cbs/menu_cbs_right.c
View File

@ -327,6 +327,17 @@ static int action_right_video_resolution(unsigned type, const char *label,
return 0; return 0;
} }
static int playlist_association_right(unsigned type, const char *label,
bool wraparound)
{
unsigned idx = type - MENU_SETTINGS_PLAYLIST_ASSOCIATION_START;
rarch_system_info_t *system = rarch_system_info_get_ptr();
(void)label;
return 0;
}
int core_setting_right(unsigned type, const char *label, int core_setting_right(unsigned type, const char *label,
bool wraparound) bool wraparound)
{ {
@ -384,6 +395,10 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
{ {
BIND_ACTION_RIGHT(cbs, action_right_input_desc); BIND_ACTION_RIGHT(cbs, action_right_input_desc);
} }
else if ((type >= MENU_SETTINGS_PLAYLIST_ASSOCIATION_START))
{
BIND_ACTION_RIGHT(cbs, playlist_association_right);
}
else if ((type >= MENU_SETTINGS_CORE_OPTION_START)) else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
{ {
BIND_ACTION_RIGHT(cbs, core_setting_right); BIND_ACTION_RIGHT(cbs, core_setting_right);

1
menu/menu.h
View File

@ -53,6 +53,7 @@
#define MENU_SETTINGS_CORE_INFO_NONE 0xffff #define MENU_SETTINGS_CORE_INFO_NONE 0xffff
#define MENU_SETTINGS_CORE_OPTION_NONE 0xffff #define MENU_SETTINGS_CORE_OPTION_NONE 0xffff
#define MENU_SETTINGS_CORE_OPTION_START 0x10000 #define MENU_SETTINGS_CORE_OPTION_START 0x10000
#define MENU_SETTINGS_PLAYLIST_ASSOCIATION_START 0x20000
#define MENU_KEYBOARD_BIND_TIMEOUT_SECONDS 5 #define MENU_KEYBOARD_BIND_TIMEOUT_SECONDS 5

2
menu/menu_displaylist.c
View File

@ -2509,7 +2509,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
path_remove_extension(path_base); path_remove_extension(path_base);
menu_entries_push(info->list, menu_entries_push(info->list,
path_base, path_base,
str_list->elems[i].data, MENU_FILE_PLAYLIST_ASSOCIATION, 0, 0); str_list->elems[i].data, MENU_SETTINGS_PLAYLIST_ASSOCIATION_START + i, 0, 0);
} }
string_list_free(str_list); string_list_free(str_list);
} }