encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed updating the rumble parameters on Linux

This commit is contained in:
Sam Lantinga 2018-10-16 14:58:07 -07:00
parent b0c48dd9dd
commit 708ad1fd8d
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/joystick/linux/SDL_sysjoystick.c
View File

@ -814,26 +814,24 @@ LINUX_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint1
{ {
struct input_event event; struct input_event event;
if (joystick->hwdata->effect.id < 0) { if (joystick->hwdata->ff_rumble) {
if (joystick->hwdata->ff_rumble) { struct ff_effect *effect = &joystick->hwdata->effect;
struct ff_effect *effect = &joystick->hwdata->effect;
effect->type = FF_RUMBLE; effect->type = FF_RUMBLE;
effect->replay.length = SDL_min(duration_ms, 32767); effect->replay.length = SDL_min(duration_ms, 32767);
effect->u.rumble.strong_magnitude = low_frequency_rumble; effect->u.rumble.strong_magnitude = low_frequency_rumble;
effect->u.rumble.weak_magnitude = high_frequency_rumble; effect->u.rumble.weak_magnitude = high_frequency_rumble;
} else if (joystick->hwdata->ff_sine) { } else if (joystick->hwdata->ff_sine) {
/* Scale and average the two rumble strengths */ /* Scale and average the two rumble strengths */
Sint16 magnitude = (Sint16)(((low_frequency_rumble / 2) + (high_frequency_rumble / 2)) / 2); Sint16 magnitude = (Sint16)(((low_frequency_rumble / 2) + (high_frequency_rumble / 2)) / 2);
struct ff_effect *effect = &joystick->hwdata->effect; struct ff_effect *effect = &joystick->hwdata->effect;
effect->type = FF_PERIODIC; effect->type = FF_PERIODIC;
effect->replay.length = SDL_min(duration_ms, 32767); effect->replay.length = SDL_min(duration_ms, 32767);
effect->u.periodic.waveform = FF_SINE; effect->u.periodic.waveform = FF_SINE;
effect->u.periodic.magnitude = magnitude; effect->u.periodic.magnitude = magnitude;
} else { } else {
return SDL_Unsupported(); return SDL_Unsupported();
}
} }
if (ioctl(joystick->hwdata->fd, EVIOCSFF, &joystick->hwdata->effect) < 0) { if (ioctl(joystick->hwdata->fd, EVIOCSFF, &joystick->hwdata->effect) < 0) {