mirror of
https://github.com/cemu-project/DS4Windows.git
synced 2024-11-26 19:14:20 +01:00
Output thread tweaks
This commit is contained in:
parent
a894179c98
commit
0d10004624
@ -163,7 +163,6 @@ namespace DS4Windows
|
|||||||
public event EventHandler<EventArgs> Removal = null;
|
public event EventHandler<EventArgs> Removal = null;
|
||||||
public event EventHandler<EventArgs> SyncChange = null;
|
public event EventHandler<EventArgs> SyncChange = null;
|
||||||
public event EventHandler<EventArgs> SerialChange = null;
|
public event EventHandler<EventArgs> SerialChange = null;
|
||||||
//public event EventHandler<EventArgs> PublishRemoval = null;
|
|
||||||
|
|
||||||
public HidDevice HidDevice => hDevice;
|
public HidDevice HidDevice => hDevice;
|
||||||
public bool IsExclusive => HidDevice.IsExclusive;
|
public bool IsExclusive => HidDevice.IsExclusive;
|
||||||
@ -579,25 +578,20 @@ namespace DS4Windows
|
|||||||
int lastError = 0;
|
int lastError = 0;
|
||||||
while (!exitOutputThread)
|
while (!exitOutputThread)
|
||||||
{
|
{
|
||||||
bool result = false;
|
bool result = false, currentRumble = false;
|
||||||
|
|
||||||
if (outputRumble)
|
if (currentRumble)
|
||||||
{
|
{
|
||||||
lock (outputReportBuffer)
|
|
||||||
{
|
|
||||||
outputReportBuffer.CopyTo(outputReport, 0);
|
|
||||||
outputPendCount--;
|
|
||||||
outputRumble = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
lock(outputReport)
|
lock(outputReport)
|
||||||
{
|
{
|
||||||
result = writeOutput();
|
result = writeOutput();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
currentRumble = false;
|
||||||
if (!result)
|
if (!result)
|
||||||
{
|
{
|
||||||
outputRumble = true;
|
currentRumble = true;
|
||||||
|
exitOutputThread = true;
|
||||||
int thisError = Marshal.GetLastWin32Error();
|
int thisError = Marshal.GetLastWin32Error();
|
||||||
if (lastError != thisError)
|
if (lastError != thisError)
|
||||||
{
|
{
|
||||||
@ -608,11 +602,18 @@ namespace DS4Windows
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!outputRumble)
|
if (!currentRumble)
|
||||||
{
|
{
|
||||||
lastError = 0;
|
lastError = 0;
|
||||||
lock (outputReportBuffer)
|
lock (outputReportBuffer)
|
||||||
|
{
|
||||||
Monitor.Wait(outputReportBuffer);
|
Monitor.Wait(outputReportBuffer);
|
||||||
|
outputReportBuffer.CopyTo(outputReport, 0);
|
||||||
|
outputPendCount--;
|
||||||
|
outputRumble = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
currentRumble = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user