mirror/antimicrox
1
0
Fork 0
mirror of https://github.com/AntiMicroX/antimicrox.git synced 2026-08-01 01:56:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Small changes

Browse Source
This commit is contained in:
juliagoda
2018-07-21 00:47:11 +02:00
parent f74b179c90
commit b6fd8d91e4
52 changed files with 236 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/inputdaemon.cpp
View File

@@ -37,6 +37,7 @@
const int InputDaemon::GAMECONTROLLERTRIGGERRELEASE = 16384;
InputDaemon::InputDaemon(QMap<SDL_JoystickID, InputDevice*> *joysticks,
AntiMicroSettings *settings,
bool graphical, QObject *parent) :
@@ -360,7 +361,7 @@ void InputDaemon::quit()
stopped = true;
pollResetTimer.stop();
disconnect(eventWorker, &SDLEventReader::eventRaised, this, 0);
disconnect(eventWorker, &SDLEventReader::eventRaised, this, nullptr);
// Wait for SDL to finish. Let worker destructor close SDL.
// Let InputDaemon destructor close thread instance.
@@ -875,7 +876,7 @@ void InputDaemon::modifyUnplugEvents(QQueue<SDL_Event> *sdlEventQueue)
{
if (axis->getThrottle() != static_cast<int>(JoyAxis::NormalThrottle))
{
event.jaxis.value = axis->getProperReleaseValue();
event.jaxis.value = static_cast<short>(axis->getProperReleaseValue());
}
}
}
@@ -908,7 +909,7 @@ void InputDaemon::modifyUnplugEvents(QQueue<SDL_Event> *sdlEventQueue)
if ((event.caxis.axis == SDL_CONTROLLER_AXIS_TRIGGERLEFT) ||
(event.caxis.axis == SDL_CONTROLLER_AXIS_TRIGGERRIGHT))
{
event.caxis.value = axis->getProperReleaseValue();
event.caxis.value = static_cast<short>(axis->getProperReleaseValue());
}
}
}