diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2015-08-04 15:48:40 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2015-08-11 08:37:18 +1000 |
| commit | b750c7d69fb45f755390e46c5e82637cdb34ff37 (patch) | |
| tree | 7f4afba18e49d3c34d862dfcd47faef47fd8cbf6 /src/filter.c | |
| parent | c0a1d22fead992a2fa7fe7b6f9bf35de118052e9 (diff) | |
filter: rename speed to speed_adjustment where it's in the [-1,1] range
To avoid confusion with the other speed in units/time
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/filter.c')
| -rw-r--r-- | src/filter.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/filter.c b/src/filter.c index e615deb1..400c52a8 100644 --- a/src/filter.c +++ b/src/filter.c @@ -62,15 +62,15 @@ filter_destroy(struct motion_filter *filter) bool filter_set_speed(struct motion_filter *filter, - double speed) + double speed_adjustment) { - return filter->interface->set_speed(filter, speed); + return filter->interface->set_speed(filter, speed_adjustment); } double filter_get_speed(struct motion_filter *filter) { - return filter->speed; + return filter->speed_adjustment; } /* @@ -325,25 +325,25 @@ accelerator_destroy(struct motion_filter *filter) static bool accelerator_set_speed(struct motion_filter *filter, - double speed) + double speed_adjustment) { struct pointer_accelerator *accel_filter = (struct pointer_accelerator *)filter; - assert(speed >= -1.0 && speed <= 1.0); + assert(speed_adjustment >= -1.0 && speed_adjustment <= 1.0); /* delay when accel kicks in */ - accel_filter->threshold = DEFAULT_THRESHOLD - speed / 4000.0; + accel_filter->threshold = DEFAULT_THRESHOLD - speed_adjustment / 4000.0; if (accel_filter->threshold < MINIMUM_THRESHOLD) accel_filter->threshold = MINIMUM_THRESHOLD; /* adjust max accel factor */ - accel_filter->accel = DEFAULT_ACCELERATION + speed * 1.5; + accel_filter->accel = DEFAULT_ACCELERATION + speed_adjustment * 1.5; /* higher speed -> faster to reach max */ - accel_filter->incline = DEFAULT_INCLINE + speed * 0.75; + accel_filter->incline = DEFAULT_INCLINE + speed_adjustment * 0.75; - filter->speed = speed; + filter->speed_adjustment = speed_adjustment; return true; } |