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

Added mutex and changed unplug routine slightly.

Browse Source
This commit is contained in:
Travis Nickles
2015-09-02 22:02:21 -05:00
parent 87f7293d65
commit aea901ed39
9 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/inputdaemon.cpp
View File

@@ -103,6 +103,8 @@ void InputDaemon::startWorker()
void InputDaemon::run ()
{
PadderCommon::inputDaemonMutex.lock();
// SDL has found events. The timeout is not necessary.
pollResetTimer.stop();
@@ -138,6 +140,8 @@ void InputDaemon::run ()
QTimer::singleShot(0, eventWorker, SLOT(performWork()));
pollResetTimer.start();
}
PadderCommon::inputDaemonMutex.unlock();
}
void InputDaemon::refreshJoysticks()
@@ -340,6 +344,7 @@ void InputDaemon::refreshMapping(QString mapping, InputDevice *device)
SDL_GameController *controller = SDL_GameControllerOpen(i);
GameController *damncontroller = new GameController(controller, i, settings, this);
connect(damncontroller, SIGNAL(requestWait()), eventWorker, SLOT(haltServices()));
SDL_Joystick *sdlStick = SDL_GameControllerGetJoystick(controller);
joystickID = SDL_JoystickInstanceID(sdlStick);
joysticks->insert(joystickID, damncontroller);
@@ -366,9 +371,6 @@ void InputDaemon::removeDevice(InputDevice *device)
refreshIndexes();
emit deviceRemoved(deviceID);
device->closeSDLDevice();
device->deleteLater();
}
}
@@ -418,6 +420,7 @@ void InputDaemon::addInputDevice(int index)
if (!joysticks->contains(tempJoystickID))
{
GameController *damncontroller = new GameController(controller, index, settings, this);
connect(damncontroller, SIGNAL(requestWait()), eventWorker, SLOT(haltServices()));
joysticks->insert(tempJoystickID, damncontroller);
trackcontrollers.insert(tempJoystickID, damncontroller);