libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-12-12 02:44:00 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #5727 from fr500/staging

Browse Source 
hook up touch callback
This commit is contained in:
Twinaphex 2017-11-19 22:53:58 +01:00 committed by GitHub
commit ed2db75765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
menu/cbs/menu_cbs_select.c
View File

@ -23,6 +23,12 @@
#include "../widgets/menu_entry.h"
#include "../menu_cbs.h"
#include "../menu_setting.h"
#include "../../tasks/tasks_internal.h"
#ifdef HAVE_NETWORKING
#include "../../network/netplay/netplay.h"
#include "../../network/netplay/netplay_discovery.h"
#endif
#ifndef BIND_ACTION_SELECT
#define BIND_ACTION_SELECT(cbs, name) \
@ -148,6 +154,53 @@ static int action_select_input_desc_kbd(const char *path, const char *label, uns
return action_right_input_desc_kbd(type, label, true);
}
static int action_select_netplay_connect_room(const char *path, const char *label, unsigned type,
size_t idx)
{
#ifdef HAVE_NETWORKING
char tmp_hostname[4115];
tmp_hostname[0] = '\0';
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
command_event(CMD_EVENT_NETPLAY_DEINIT, NULL);
netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL);
if (netplay_room_list[idx - 3].host_method == NETPLAY_HOST_METHOD_MITM)
{
snprintf(tmp_hostname,
sizeof(tmp_hostname),
"%s|%d",
netplay_room_list[idx - 3].mitm_address,
netplay_room_list[idx - 3].mitm_port);
}
else
{
snprintf(tmp_hostname,
sizeof(tmp_hostname),
"%s|%d",
netplay_room_list[idx - 3].address,
netplay_room_list[idx - 3].port);
}
#if 0
RARCH_LOG("[lobby] connecting to: %s with game: %s/%08x\n",
tmp_hostname,
netplay_room_list[idx - 3].gamename,
netplay_room_list[idx - 3].gamecrc);
#endif
task_push_netplay_crc_scan(netplay_room_list[idx - 3].gamecrc,
netplay_room_list[idx - 3].gamename,
tmp_hostname, netplay_room_list[idx - 3].corename);
#else
return -1;
#endif
return 0;
}
static int menu_cbs_init_bind_select_compare_type(
menu_file_list_cbs_t *cbs, unsigned type)
{
@ -182,6 +235,7 @@ static int menu_cbs_init_bind_select_compare_type(
#endif
else
{
switch (type)
{
case FILE_TYPE_USE_DIRECTORY:
@ -209,6 +263,14 @@ int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs,
BIND_ACTION_SELECT(cbs, action_select_default);
#ifdef HAVE_NETWORKING
if (cbs->enum_idx == MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM)
{
BIND_ACTION_SELECT(cbs, action_select_netplay_connect_room);
return 0;
}
#endif
if (cbs->setting)
{
uint64_t flags = cbs->setting->flags;