libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-07 14:23:29 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

(Netplay) Find content task refactor (#14089)

Browse Source
This commit is contained in:
Cthulhu-throwaway 2022-06-23 09:48:57 -03:00 committed by GitHub
parent 7553dc66b5
commit c1e8925f87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 589 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
intl/msg_hash_us.h
View File

@ -11019,10 +11019,26 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME,
"Nickname: %s"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_LOOK,
"Looking for compatible content..."
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_NO_CORE,
"No core found"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_NO_PLAYLISTS,
"No playlists found"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND,
"Compatible content found"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_NOT_FOUND,
"Failed to locate matching content by either CRC or filename"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_START_GONG,
"Start Gong"

4
menu/cbs/menu_cbs_ok.c
View File

@ -5999,8 +5999,8 @@ static int action_ok_netplay_connect_room(const char *path, const char *label,
hostname, room->gamename, room->gamecrc);
#endif
task_push_netplay_crc_scan(room->gamecrc, room->gamename, hostname,
room->corename, room->subsystem_name);
task_push_netplay_crc_scan(room->gamecrc, room->gamename,
room->subsystem_name, room->corename, hostname);
return 0;
}

4
msg_hash.h
View File

@ -3066,7 +3066,11 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_SCALE,
MENU_ENUM_LABEL_VALUE_NETPLAY_START_WHEN_LOADED,
MENU_ENUM_LABEL_VALUE_NETPLAY_LOAD_CONTENT_MANUALLY,
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_LOOK,
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_NO_CORE,
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_NO_PLAYLISTS,
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND,
MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_NOT_FOUND,
MENU_LABEL(NETPLAY_USE_MITM_SERVER),
MENU_LABEL(NETPLAY_MITM_SERVER),

4
network/discord.c
View File

@ -193,8 +193,8 @@ static void handle_discord_join_cb(retro_task_t *task, void *task_data,
snprintf(hostname, sizeof(hostname), "%s|%d",
room->address, room->port);
task_push_netplay_crc_scan(room->gamecrc, room->gamename, hostname,
room->corename, room->subsystem_name);
task_push_netplay_crc_scan(room->gamecrc, room->gamename,
room->subsystem_name, room->corename, hostname);
discord_st->connecting = true;
if (discord_st->ready)

969
tasks/task_netplay_find_content.c
View File

File diff suppressed because it is too large Load Diff

4
tasks/tasks_internal.h
View File

@ -89,8 +89,8 @@ bool task_push_wifi_connect(retro_task_callback_t cb, void*);
bool task_push_netplay_lan_scan(void (*cb)(const void*), unsigned timeout);
bool task_push_netplay_crc_scan(uint32_t crc, char* name,
const char *hostname, const char *corename, const char* subsystem);
bool task_push_netplay_crc_scan(uint32_t crc, const char *content,
const char *subsystem, const char *core, const char *hostname);
bool task_push_netplay_nat_traversal(void *data, uint16_t port);
bool task_push_netplay_nat_close(void *data);