diff options
| -rw-r--r-- | src/filter-private.h | 4 | ||||
| -rw-r--r-- | src/filter.c | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/filter-private.h b/src/filter-private.h index 0e7afa1f..f5e8b7f7 100644 --- a/src/filter-private.h +++ b/src/filter-private.h @@ -38,11 +38,11 @@ struct motion_filter_interface { uint64_t time); void (*destroy)(struct motion_filter *filter); bool (*set_speed)(struct motion_filter *filter, - double speed); + double speed_adjustment); }; struct motion_filter { - double speed; /* normalized [-1, 1] */ + double speed_adjustment; /* normalized [-1, 1] */ struct motion_filter_interface *interface; }; 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; } |