The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-17 00:16:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove controller array scan from each report process

Browse Source
This commit is contained in:
Travis Nickles 2018-04-09 16:04:44 -05:00
parent cba11fd791
commit 1c9cfc1dec
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DS4Windows/DS4Control/ControlService.cs
View File

@ -206,7 +206,11 @@ namespace DS4Windows
} }
} }
device.Report += this.On_Report; int tempIdx = i;
device.Report += (sender, e) =>
{
this.On_Report(sender, e, tempIdx);
};
TouchPadOn(i, device); TouchPadOn(i, device);
CheckProfileOptions(i, device, true); CheckProfileOptions(i, device, true);
device.StartUpdate(); device.StartUpdate();
@ -378,7 +382,12 @@ namespace DS4Windows
LoadProfile(Index, false, this, false, false); LoadProfile(Index, false, this, false, false);
touchPad[Index] = new Mouse(Index, device); touchPad[Index] = new Mouse(Index, device);
device.LightBarColor = getMainColor(Index); device.LightBarColor = getMainColor(Index);
device.Report += this.On_Report; //device.Report += this.On_Report;
int tempIdx = Index;
device.Report += (sender, e) =>
{
this.On_Report(sender, e, tempIdx);
};
if (!getDInputOnly(Index) && device.isSynced()) if (!getDInputOnly(Index) && device.isSynced())
{ {
int xinputIndex = x360Bus.FirstController + Index; int xinputIndex = x360Bus.FirstController + Index;
@ -746,17 +755,18 @@ namespace DS4Windows
private string[] tempStrings = new string[4] { string.Empty, string.Empty, string.Empty, string.Empty }; private string[] tempStrings = new string[4] { string.Empty, string.Empty, string.Empty, string.Empty };
// Called every time a new input report has arrived // Called every time a new input report has arrived
protected virtual void On_Report(object sender, EventArgs e) protected virtual void On_Report(object sender, EventArgs e, int ind)
{ {
DS4Device device = (DS4Device)sender; DS4Device device = (DS4Device)sender;
int ind = -1; /*int ind = -1;
for (int i = 0, arlength = DS4_CONTROLLER_COUNT; ind == -1 && i < arlength; i++) for (int i = 0, arlength = DS4_CONTROLLER_COUNT; ind == -1 && i < arlength; i++)
{ {
DS4Device tempDev = DS4Controllers[i]; DS4Device tempDev = DS4Controllers[i];
if (tempDev != null && device == tempDev) if (tempDev != null && device == tempDev)
ind = i; ind = i;
} }
*/
if (ind != -1) if (ind != -1)
{ {