ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a new order for socket connection instructions (resolves #1174) 

patch by @Ashafix
This commit is contained in:
YoshiRulz 2019-06-09 14:53:35 +10:00 committed by James Groom
parent 1a00cf7dd3
commit 0d610301ec
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BizHawk.Client.EmuHawk/Communication.cs
View File

@ -165,7 +165,7 @@ namespace BizHawk.Client.EmuHawk
}
}
Decoder decoder = Encoding.UTF8.GetDecoder();
readonly Decoder decoder = Encoding.UTF8.GetDecoder();
Socket soc = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
IPAddress ipAdd;
IPEndPoint remoteEP;
@ -175,19 +175,14 @@ namespace BizHawk.Client.EmuHawk
public int Retries { get; set; } = 10;
public bool success = false; //indicates whether the last command was executed succesfully
public void Initialize(IVideoProvider _currentVideoProvider)
public void Initialize()
{
currentVideoProvider = _currentVideoProvider;
SetIp(ip, port);
if (currentVideoProvider == null) currentVideoProvider = Global.Emulator.AsVideoProviderOrDefault();
initialized = true;
}
public void Connect()
{
if (!initialized)
{
Initialize(currentVideoProvider);
}
remoteEP = new IPEndPoint(ipAdd, port);
soc = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
soc.Connect(remoteEP);
@ -200,7 +195,7 @@ namespace BizHawk.Client.EmuHawk
ip = ip_;
port = port_;
ipAdd = System.Net.IPAddress.Parse(ip);
remoteEP = new IPEndPoint(ipAdd, port);
Connect();
}
public string GetInfo()
@ -248,9 +243,9 @@ namespace BizHawk.Client.EmuHawk
public string SendScreenshot(int waitingTime)
{
if (!connected)
if (!initialized)
{
Connect();
Initialize();
}
ScreenShot screenShot = new ScreenShot();
using (BitmapBuffer bb = screenShot.MakeScreenShotImage())

3
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Communication.cs
View File

@ -36,6 +36,9 @@ namespace BizHawk.Client.EmuHawk
return list.ToString();
}
[LuaMethod("socketServerIsConnected", "socketServerIsConnected")]
public bool SocketServerIsConnected() => GlobalWin.socketServer.connected;
[LuaMethod("socketServerScreenShot", "sends a screenshot to the Socket server")]
public string SocketServerScreenShot()
{