mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-01 00:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:libretro/RetroArch

Browse Source
This commit is contained in:
radius 2015-07-03 09:23:09 -05:00
commit 00ad437474
4 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
menu/cbs/menu_cbs_ok.c
View File

@ -1286,7 +1286,23 @@ static int action_ok_download_generic(const char *path,
if (!strcmp(type_msg, "cb_update_assets")) if (!strcmp(type_msg, "cb_update_assets"))
path = "assets.zip"; path = "assets.zip";
else if (!strcmp(type_msg, "cb_update_autoconfig_profiles")) else if (!strcmp(type_msg, "cb_update_autoconfig_profiles"))
{
#ifdef ANDROID
path = "autoconf_android.zip";
#elif defined(__QNX__)
path = "autoconf_qnx.zip";
#elif defined(HAVE_UDEV)
path = "autoconf_udev.zip";
#elif defined(HAVE_XINPUT2)
path = "autoconf_xinput.zip";
#else
path = "autoconf.zip"; path = "autoconf.zip";
#endif
}
#ifdef HAVE_HID
else if (!strcmp(type_msg, "cb_update_autoconfig_profiles_hid"))
path = "autoconf_hid.zip";
#endif
else if (!strcmp(type_msg, "cb_update_cheats")) else if (!strcmp(type_msg, "cb_update_cheats"))
path = "cheats.zip"; path = "cheats.zip";
else if (!strcmp(type_msg, "cb_update_overlays")) else if (!strcmp(type_msg, "cb_update_overlays"))
@ -1397,6 +1413,16 @@ static int action_ok_update_autoconfig_profiles(const char *path,
return 0; return 0;
} }
static int action_ok_update_autoconfig_profiles_hid(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
#ifdef HAVE_NETWORKING
action_ok_download_generic(path, label, type, idx, entry_idx,
"cb_update_autoconfig_profiles_hid");
#endif
return 0;
}
static int action_ok_disk_cycle_tray_status(const char *path, static int action_ok_disk_cycle_tray_status(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
@ -1789,6 +1815,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES: case MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES:
cbs->action_ok = action_ok_update_autoconfig_profiles; cbs->action_ok = action_ok_update_autoconfig_profiles;
break; break;
case MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES_HID:
cbs->action_ok = action_ok_update_autoconfig_profiles_hid;
break;
default: default:
return -1; return -1;
} }

4
menu/intl/menu_hash_us.c
View File

@ -564,6 +564,8 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
return "update_cheats"; return "update_cheats";
case MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES: case MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES:
return "update_autoconfig_profiles"; return "update_autoconfig_profiles";
case MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES_HID:
return "update_autoconfig_profiles_hid";
case MENU_LABEL_UPDATE_DATABASES: case MENU_LABEL_UPDATE_DATABASES:
return "update_databases"; return "update_databases";
case MENU_LABEL_UPDATE_OVERLAYS: case MENU_LABEL_UPDATE_OVERLAYS:
@ -1144,6 +1146,8 @@ const char *menu_hash_to_str_us(uint32_t hash)
return "Update Cheats"; return "Update Cheats";
case MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES: case MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES:
return "Update Autoconfig Profiles"; return "Update Autoconfig Profiles";
case MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES_HID:
return "Update Autoconfig Profiles (HID)";
case MENU_LABEL_VALUE_UPDATE_DATABASES: case MENU_LABEL_VALUE_UPDATE_DATABASES:
return "Update Databases"; return "Update Databases";
case MENU_LABEL_VALUE_UPDATE_OVERLAYS: case MENU_LABEL_VALUE_UPDATE_OVERLAYS:

7
menu/menu_displaylist.c
View File

@ -1697,6 +1697,13 @@ static int menu_displaylist_parse_options(menu_displaylist_info_t *info)
menu_hash_to_str(MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES), menu_hash_to_str(MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES),
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_HID
menu_list_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES_HID),
menu_hash_to_str(MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES_HID),
MENU_SETTING_ACTION, 0, 0);
#endif
menu_list_push(info->list, menu_list_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_CHEATS), menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_CHEATS),
menu_hash_to_str(MENU_LABEL_UPDATE_CHEATS), menu_hash_to_str(MENU_LABEL_UPDATE_CHEATS),

3
menu/menu_hash.h
View File

@ -25,6 +25,9 @@ extern "C" {
#define MENU_VALUE_SEARCH 0xd0d5febbU #define MENU_VALUE_SEARCH 0xd0d5febbU
#define MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES_HID 0x1e94ee4dU
#define MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES_HID 0x524f4590U
#define MENU_VALUE_DONT_CARE 0x19da07bcU #define MENU_VALUE_DONT_CARE 0x19da07bcU
#define MENU_VALUE_LINEAR 0xc0d12dc0U #define MENU_VALUE_LINEAR 0xc0d12dc0U
#define MENU_VALUE_NEAREST 0x6ab2b0b7U #define MENU_VALUE_NEAREST 0x6ab2b0b7U