Commit 708ad1fd8ddf597868c0313bef8e7114a540ec0b
2018-10-16T14:58:07
Fixed updating the rumble parameters on Linux
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
index 795f92b..d70ee02 100644
--- a/src/joystick/linux/SDL_sysjoystick.c
+++ b/src/joystick/linux/SDL_sysjoystick.c
@@ -814,26 +814,24 @@ LINUX_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint1
{
struct input_event event;
- if (joystick->hwdata->effect.id < 0) {
- if (joystick->hwdata->ff_rumble) {
- struct ff_effect *effect = &joystick->hwdata->effect;
-
- effect->type = FF_RUMBLE;
- effect->replay.length = SDL_min(duration_ms, 32767);
- effect->u.rumble.strong_magnitude = low_frequency_rumble;
- effect->u.rumble.weak_magnitude = high_frequency_rumble;
- } else if (joystick->hwdata->ff_sine) {
- /* Scale and average the two rumble strengths */
- Sint16 magnitude = (Sint16)(((low_frequency_rumble / 2) + (high_frequency_rumble / 2)) / 2);
- struct ff_effect *effect = &joystick->hwdata->effect;
-
- effect->type = FF_PERIODIC;
- effect->replay.length = SDL_min(duration_ms, 32767);
- effect->u.periodic.waveform = FF_SINE;
- effect->u.periodic.magnitude = magnitude;
- } else {
- return SDL_Unsupported();
- }
+ if (joystick->hwdata->ff_rumble) {
+ struct ff_effect *effect = &joystick->hwdata->effect;
+
+ effect->type = FF_RUMBLE;
+ effect->replay.length = SDL_min(duration_ms, 32767);
+ effect->u.rumble.strong_magnitude = low_frequency_rumble;
+ effect->u.rumble.weak_magnitude = high_frequency_rumble;
+ } else if (joystick->hwdata->ff_sine) {
+ /* Scale and average the two rumble strengths */
+ Sint16 magnitude = (Sint16)(((low_frequency_rumble / 2) + (high_frequency_rumble / 2)) / 2);
+ struct ff_effect *effect = &joystick->hwdata->effect;
+
+ effect->type = FF_PERIODIC;
+ effect->replay.length = SDL_min(duration_ms, 32767);
+ effect->u.periodic.waveform = FF_SINE;
+ effect->u.periodic.magnitude = magnitude;
+ } else {
+ return SDL_Unsupported();
}
if (ioctl(joystick->hwdata->fd, EVIOCSFF, &joystick->hwdata->effect) < 0) {