diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index f66df711e3..6e886710de 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -938,7 +938,11 @@ static void menu_action_setting_disp_set_label(file_list_t* list, 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; if (!system) diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 797095bca4..aeb178e28f 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -303,6 +303,17 @@ static int action_left_video_resolution(unsigned type, const char *label, 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, 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); } + else if ((type >= MENU_SETTINGS_PLAYLIST_ASSOCIATION_START)) + { + BIND_ACTION_LEFT(cbs, playlist_association_left); + } else if ((type >= MENU_SETTINGS_CORE_OPTION_START)) { BIND_ACTION_LEFT(cbs, core_setting_left); diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 5495f87509..0f4e679895 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -327,6 +327,17 @@ static int action_right_video_resolution(unsigned type, const char *label, 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, 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); } + else if ((type >= MENU_SETTINGS_PLAYLIST_ASSOCIATION_START)) + { + BIND_ACTION_RIGHT(cbs, playlist_association_right); + } else if ((type >= MENU_SETTINGS_CORE_OPTION_START)) { BIND_ACTION_RIGHT(cbs, core_setting_right); diff --git a/menu/menu.h b/menu/menu.h index 6f5a02ee4e..cda5c903e5 100644 --- a/menu/menu.h +++ b/menu/menu.h @@ -50,9 +50,10 @@ #define MAX_CHEAT_COUNTERS 100 #endif -#define MENU_SETTINGS_CORE_INFO_NONE 0xffff -#define MENU_SETTINGS_CORE_OPTION_NONE 0xffff -#define MENU_SETTINGS_CORE_OPTION_START 0x10000 +#define MENU_SETTINGS_CORE_INFO_NONE 0xffff +#define MENU_SETTINGS_CORE_OPTION_NONE 0xffff +#define MENU_SETTINGS_CORE_OPTION_START 0x10000 +#define MENU_SETTINGS_PLAYLIST_ASSOCIATION_START 0x20000 #define MENU_KEYBOARD_BIND_TIMEOUT_SECONDS 5 diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 7d8d8d5cde..514c93fa66 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2509,7 +2509,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) path_remove_extension(path_base); menu_entries_push(info->list, 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); }