accel_profile_smooth_simple: Cleanup

Cleanup the code a bit, and make sure accel is at least 1.0 .

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/filter.c b/src/filter.c
index 1762f98..487669c 100644 (file)
--- a/src/filter.c
+++ b/src/filter.c
@@ -336,20 +336,23 @@ pointer_accel_profile_smooth_simple(struct motion_filter *filter,
        double accel = DEFAULT_ACCELERATION;
        double smooth_accel_coefficient;
 
+       if (threshold < 1.0)
+               threshold = 1.0;
+       if (accel < 1.0)
+               accel = 1.0;
+
        velocity *= DEFAULT_CONSTANT_ACCELERATION;
 
        if (velocity < 1.0)
                return calc_penumbral_gradient(0.5 + velocity * 0.5) * 2.0 - 1.0;
-       if (threshold < 1.0)
-               threshold = 1.0;
+
        if (velocity <= threshold)
-               return 1;
+               return 1.0;
+
        velocity /= threshold;
-       if (velocity >= accel) {
+       if (velocity >= accel)
                return accel;
-       } else {
-               smooth_accel_coefficient =
-                       calc_penumbral_gradient(velocity / accel);
-               return 1.0 + (smooth_accel_coefficient * (accel - 1.0));
-       }
+
+       smooth_accel_coefficient = calc_penumbral_gradient(velocity / accel);
+       return 1.0 + (smooth_accel_coefficient * (accel - 1.0));
 }