geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow XInput haptics to run for SDL_HAPTIC_INFINITY time (thanks, Mitchell!). 

Partially fixes Bugzilla #2126.
main
Ryan C. Gordon 2013-10-20 15:55:47 -04:00
parent 6e1169ddc2
commit b285b60092
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/haptic/windows/SDL_syshaptic.c
View File

@ -1327,7 +1327,11 @@ SDL_SYS_HapticRunEffect(SDL_Haptic * haptic, struct haptic_effect *effect,
XINPUT_VIBRATION *vib = &effect->hweffect->vibration; XINPUT_VIBRATION *vib = &effect->hweffect->vibration;
SDL_assert(effect->effect.type == SDL_HAPTIC_LEFTRIGHT); /* should catch this at higher level */ SDL_assert(effect->effect.type == SDL_HAPTIC_LEFTRIGHT); /* should catch this at higher level */
SDL_LockMutex(haptic->hwdata->mutex); SDL_LockMutex(haptic->hwdata->mutex);
if(effect->effect.leftright.length == SDL_HAPTIC_INFINITY || iterations == SDL_HAPTIC_INFINITY) {
haptic->hwdata->stopTicks = SDL_HAPTIC_INFINITY;
} else {
haptic->hwdata->stopTicks = SDL_GetTicks() + (effect->effect.leftright.length * iterations); haptic->hwdata->stopTicks = SDL_GetTicks() + (effect->effect.leftright.length * iterations);
}
SDL_UnlockMutex(haptic->hwdata->mutex); SDL_UnlockMutex(haptic->hwdata->mutex);
return (XINPUTSETSTATE(haptic->hwdata->userid, vib) == ERROR_SUCCESS) ? 0 : -1; return (XINPUTSETSTATE(haptic->hwdata->userid, vib) == ERROR_SUCCESS) ? 0 : -1;
} }
@ -1560,11 +1564,14 @@ SDL_RunXInputHaptic(void *arg)
SDL_Delay(50); SDL_Delay(50);
SDL_LockMutex(hwdata->mutex); SDL_LockMutex(hwdata->mutex);
/* If we're currently running and need to stop... */ /* If we're currently running and need to stop... */
if ((hwdata->stopTicks) && (hwdata->stopTicks < SDL_GetTicks())) { const Uint32 stopTicks = hwdata->stopTicks;
if (stopTicks) {
if ((stopTicks != SDL_HAPTIC_INFINITY) && (stopTicks < SDL_GetTicks())) {
XINPUT_VIBRATION vibration = { 0, 0 }; XINPUT_VIBRATION vibration = { 0, 0 };
hwdata->stopTicks = 0; hwdata->stopTicks = 0;
XINPUTSETSTATE(hwdata->userid, &vibration); XINPUTSETSTATE(hwdata->userid, &vibration);
} }
}
SDL_UnlockMutex(hwdata->mutex); SDL_UnlockMutex(hwdata->mutex);
} }