update menu

This commit is contained in:
radius 2017-01-28 11:16:44 -05:00
parent 74b2fde05a
commit 1d4be4cb1b
3 changed files with 25 additions and 13 deletions

View File

@ -3138,16 +3138,16 @@ static int action_ok_netplay_connect_room(const char *path,
snprintf(tmp_hostname,
sizeof(tmp_hostname),
"%s:%d",
netplay_room_list[idx - 1].address,
netplay_room_list[idx - 1].port);
netplay_room_list[idx - 2].address,
netplay_room_list[idx - 2].port);
RARCH_LOG("Connecting to: %s with game: %s/%08x\n",
tmp_hostname,
netplay_room_list[idx - 1].gamename,
netplay_room_list[idx - 1].gamecrc);
netplay_room_list[idx - 2].gamename,
netplay_room_list[idx - 2].gamecrc);
task_push_netplay_crc_scan(netplay_room_list[idx - 1].gamecrc,
netplay_room_list[idx - 1].gamename,
task_push_netplay_crc_scan(netplay_room_list[idx - 2].gamecrc,
netplay_room_list[idx - 2].gamename,
tmp_hostname, netplay_room_list[idx - 1].corename);
#else
@ -3367,6 +3367,11 @@ finish:
}
#endif
menu_entries_append_enum(file_list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST),
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST),
MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(file_list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_REFRESH_ROOMS),
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS),
@ -3426,7 +3431,6 @@ finish:
msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM),
MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM,
MENU_WIFI, 0, 0);
}
}
}

View File

@ -155,8 +155,8 @@ static int action_bind_sublabel_netplay_room(
return 0;
snprintf(s,len, "%s (%s)\n%s (%08x)",
netplay_room_list[i - 1].corename, netplay_room_list[i - 1].coreversion,
netplay_room_list[i - 1].gamename, netplay_room_list[i - 1].gamecrc);
netplay_room_list[i - 2].corename, netplay_room_list[i - 2].coreversion,
netplay_room_list[i - 2].gamename, netplay_room_list[i - 2].gamecrc);
#if 0
strlcpy(s, netplay_room_list[i - 1].corename, len);
#endif

View File

@ -226,6 +226,7 @@ static void print_buf_lines(file_list_t *list, char *buf,
static int menu_displaylist_parse_netplay(
menu_displaylist_info_t *info)
{
settings_t *settings = config_get_ptr();
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST),
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST),
@ -249,10 +250,11 @@ static int menu_displaylist_parse_netplay(
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS),
MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS, MENU_SETTING_GROUP, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_TAB),
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB),
MENU_ENUM_LABEL_NETPLAY_TAB, MENU_SETTING_GROUP, 0, 0);
if (!string_is_equal(settings->menu.driver, "xmb"))
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_TAB),
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB),
MENU_ENUM_LABEL_NETPLAY_TAB, MENU_SETTING_GROUP, 0, 0);
return 0;
}
@ -2954,6 +2956,11 @@ static int menu_displaylist_parse_netplay_room_list(
{
#ifdef HAVE_NETWORKING
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST),
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST),
MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_REFRESH_ROOMS),
msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS),
@ -2976,6 +2983,7 @@ static int menu_displaylist_parse_netplay_room_list(
msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM),
MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM,
MENU_WIFI, 0, 0);
}
}
#endif