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

Refactor OpenTK gamepad management (the static stuff) 

maybe fixes #2429
This commit is contained in:
YoshiRulz 2021-01-15 05:39:04 +10:00
parent d2fb794340
commit e71506ac6a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/BizHawk.Client.EmuHawk/Input/OTK_Gamepad.cs
View File

@ -20,50 +20,61 @@ namespace BizHawk.Client.EmuHawk
private static readonly object _syncObj = new object();
private static readonly List<OTK_GamePad> Devices = new List<OTK_GamePad>();
private static readonly List<OTK_GamePad> Devices = new();
private static volatile bool initialized = false;
/// <remarks>Initialization is only called once when MainForm loads</remarks>
public static void Initialize()
{
var playerCount = 0;
for (var i = 0; i < MAX_GAMEPADS; i++)
{
if (OpenTKGamePad.GetState(i).IsConnected || Joystick.GetState(i).IsConnected)
{
Console.WriteLine($"OTK GamePad/Joystick index: {i}");
Devices.Add(new OTK_GamePad(i, ++playerCount));
}
}
for (var i = 0; i < MAX_GAMEPADS; i++) OpenTKGamePad.GetState(i); // not sure if this is important to do at this time, but the processing which used to be done here included calls to OpenTK, so I left this no-op just in case --yoshi
initialized = true;
}
public static IEnumerable<OTK_GamePad> EnumerateDevices()
{
if (!initialized) yield break;
lock (_syncObj)
{
if (initialized)
foreach (var device in Devices) yield return device;
foreach (var device in Devices) yield return device;
}
}
public static void UpdateAll()
{
if (!initialized) return;
lock (_syncObj)
{
if (initialized)
foreach (var device in Devices) device.Update();
}
}
public static void CloseAll()
{
lock (_syncObj)
{
if (!initialized)
throw new InvalidOperationException("Well, however did this happen");
for (var tryIndex = 0; tryIndex < MAX_GAMEPADS; tryIndex++)
{
var isConnectedAtIndex = OpenTKGamePad.GetState(tryIndex).IsConnected || Joystick.GetState(tryIndex).IsConnected;
var knownAsIndex = Devices.FindIndex(dev => dev._deviceIndex == tryIndex);
if (knownAsIndex != -1)
{
if (isConnectedAtIndex)
{
Devices[knownAsIndex].Update();
}
else
{
var known = Devices[knownAsIndex];
Console.WriteLine($"Dropped gamepad #{knownAsIndex}, was port#{known._deviceIndex} ({known._name}) via OpenTK");
Devices.RemoveAt(knownAsIndex);
}
}
else
{
if (isConnectedAtIndex)
{
var newConn = new OTK_GamePad(tryIndex, Devices.Count);
Devices.Insert(tryIndex, newConn); // try and keep our indices in line with the OpenTK ones
Console.WriteLine($"Connected new gamepad #{tryIndex}, port#{newConn._deviceIndex} ({newConn._name}) via OpenTK");
}
else
{
// was and is disconnected, move along
}
}
}
}
}