From 9e1c426a3abd8726d465063808c6ef1ba1c7cf22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Thu, 25 May 2017 17:35:14 +0200 Subject: [PATCH] Use the new netplay room list in place of the old netplay menu --- menu/cbs/menu_cbs_deferred_push.c | 13 +--- menu/cbs/menu_cbs_ok.c | 14 +---- menu/drivers/xmb.c | 3 - menu/menu_displaylist.c | 101 ------------------------------ 4 files changed, 3 insertions(+), 128 deletions(-) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 0ff2f66845..19d5db361f 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -193,11 +193,6 @@ static int deferred_push_network_settings_list(menu_displaylist_info_t *info) return deferred_push_dlist(info, DISPLAYLIST_NETWORK_SETTINGS_LIST); } -static int deferred_push_netplay_lan_scan_settings_list(menu_displaylist_info_t *info) -{ - return deferred_push_dlist(info, DISPLAYLIST_NETPLAY_LAN_SCAN_SETTINGS_LIST); -} - static int deferred_push_lakka_services_list(menu_displaylist_info_t *info) { return deferred_push_dlist(info, DISPLAYLIST_LAKKA_SERVICES_LIST); @@ -312,7 +307,7 @@ static int deferred_push_options(menu_displaylist_info_t *info) static int deferred_push_netplay(menu_displaylist_info_t *info) { - return deferred_push_dlist(info, DISPLAYLIST_NETPLAY); + return deferred_push_dlist(info, DISPLAYLIST_NETPLAY_ROOM_LIST); } static int deferred_push_content_settings(menu_displaylist_info_t *info) @@ -988,12 +983,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( return 0; } - if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_NETPLAY_LAN_SCAN_SETTINGS_LIST))) - { - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_netplay_lan_scan_settings_list); - return 0; - } - if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_LAKKA_SERVICES_LIST))) { BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_lakka_services_list); diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index ce4153cf7d..f578544d25 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3133,13 +3133,6 @@ static int action_ok_network_list(const char *path, entry_idx, ACTION_OK_DL_NETWORK_SETTINGS_LIST); } -static int action_ok_netplay_lan_scan_list(const char *path, - const char *label, unsigned type, size_t idx, size_t entry_idx) -{ - return generic_action_ok_displaylist_push(path, NULL, label, type, idx, - entry_idx, ACTION_OK_DL_NETPLAY_LAN_SCAN_SETTINGS_LIST); -} - static int action_ok_netplay_connect_room(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { @@ -3455,8 +3448,8 @@ static void netplay_refresh_rooms_cb(void *task_data, void *user_data, const cha menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL); /* Don't push the results if we left the netplay menu */ - if (!string_is_equal(label, - msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB))) + if (!string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB)) + && !string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY))) return; if (!data || err) @@ -4465,9 +4458,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_NETWORK_SETTINGS: BIND_ACTION_OK(cbs, action_ok_network_list); break; - case MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS: - BIND_ACTION_OK(cbs, action_ok_netplay_lan_scan_list); - break; case MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM: BIND_ACTION_OK(cbs, action_ok_netplay_connect_room); break; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 0ea380d392..e5fc408bc6 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -4078,9 +4078,6 @@ static int xmb_list_push(void *data, void *userdata, #if defined(HAVE_NETWORKING) entry.enum_idx = MENU_ENUM_LABEL_ONLINE_UPDATER; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); - - entry.enum_idx = MENU_ENUM_LABEL_NETPLAY; - menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); #endif entry.enum_idx = MENU_ENUM_LABEL_INFORMATION_LIST; menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry); diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index e77c4c701d..93b4b46b4e 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -324,42 +324,6 @@ static void print_buf_lines(file_list_t *list, char *buf, * with a newline, just ignore the partial last line. */ } -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), - 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_ENABLE_CLIENT), - msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_ENABLE_CLIENT), - MENU_ENUM_LABEL_NETPLAY_ENABLE_CLIENT, - MENU_SETTING_ACTION, 0, 0); - - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT), - msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_DISCONNECT), - MENU_ENUM_LABEL_NETPLAY_DISCONNECT, - MENU_SETTING_ACTION, 0, 0); - - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS), - msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS), - MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS, MENU_SETTING_GROUP, 0, 0); - - if (string_is_not_equal_fast(settings->arrays.menu_driver, "xmb", 3)) - 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; -} - #if !defined(HAVE_SOCKET_LEGACY) && !defined(WIIU) #include @@ -2878,12 +2842,6 @@ static int menu_displaylist_parse_load_content_settings( MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS, MENU_SETTING_ACTION, 0, 0); -#if defined(HAVE_NETWORKING) && !defined(HAVE_LAKKA) - menu_displaylist_parse_settings_enum(menu, info, - MENU_ENUM_LABEL_NETPLAY, - PARSE_ACTION, false); -#endif - #ifdef HAVE_LAKKA if (show_advanced_settings) #endif @@ -4231,7 +4189,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_DATABASE_ENTRY: case DISPLAYLIST_DATABASE_QUERY: case DISPLAYLIST_OPTIONS_SHADERS: - case DISPLAYLIST_NETPLAY: case DISPLAYLIST_CORE_CONTENT: case DISPLAYLIST_CORE_CONTENT_DIRS: case DISPLAYLIST_PLAYLIST_COLLECTION: @@ -4276,7 +4233,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_UPDATER_SETTINGS_LIST: case DISPLAYLIST_WIFI_SETTINGS_LIST: case DISPLAYLIST_NETWORK_SETTINGS_LIST: - case DISPLAYLIST_NETPLAY_LAN_SCAN_SETTINGS_LIST: case DISPLAYLIST_LAKKA_SERVICES_LIST: case DISPLAYLIST_USER_SETTINGS_LIST: case DISPLAYLIST_DIRECTORY_SETTINGS_LIST: @@ -5158,49 +5114,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) 0, 0, 0); } - info->need_refresh = true; - info->need_push = true; - break; - case DISPLAYLIST_NETPLAY_LAN_SCAN_SETTINGS_LIST: -#ifdef HAVE_NETWORKING - { - struct netplay_host_list *hosts; - - if (!netplay_discovery_driver_ctl(RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES, &hosts)) - hosts = NULL; - - if (!hosts || hosts->size == 0) - { - task_push_netplay_lan_scan(netplay_lan_scan_callback); - - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_NETPLAY_HOSTS_FOUND), - msg_hash_to_str(MENU_ENUM_LABEL_NO_NETPLAY_HOSTS_FOUND), - MENU_ENUM_LABEL_NO_NETPLAY_HOSTS_FOUND, - 0, 0, 0); - } - else - { - size_t i; - for (i = 0; i < hosts->size; i++) - { - struct netplay_host *host = &hosts->hosts[i]; - menu_entries_append_enum(info->list, - host->nick, - msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_NETPLAY_LAN), - MENU_ENUM_LABEL_CONNECT_NETPLAY_LAN, - MENU_NETPLAY_LAN_SCAN, 0, 0); - } - } - } -#else - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_NETPLAY_HOSTS_FOUND), - msg_hash_to_str(MENU_ENUM_LABEL_NO_NETPLAY_HOSTS_FOUND), - MENU_ENUM_LABEL_NO_NETPLAY_HOSTS_FOUND, - 0, 0, 0); -#endif - info->need_refresh = true; info->need_push = true; break; @@ -5847,20 +5760,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) case DISPLAYLIST_OPTIONS_SHADERS: ret = menu_displaylist_parse_shader_options(info); - info->need_push = true; - break; - case DISPLAYLIST_NETPLAY: -#ifdef HAVE_NETWORKING - ret = menu_displaylist_parse_netplay(info); -#else - menu_entries_append_enum(info->list, - msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ITEMS), - msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS), - MENU_ENUM_LABEL_NO_ITEMS, - MENU_SETTING_NO_ITEM, 0, 0); - ret = 0; -#endif - info->need_push = true; break; case DISPLAYLIST_CORE_CONTENT: