summaryrefslogtreecommitdiffstats
path: root/input/input.h
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossymiles@gmail.com>2017-04-25 18:03:06 +1000
committerJames Ross-Gowan <rossymiles@gmail.com>2017-05-12 22:58:58 +1000
commit89fd3e1d9d25731c6cae8af1b9c5b0bae726c436 (patch)
tree84bd2fbe5b7af1c7245f4387464fd947474b149c /input/input.h
parent937128697fbbef6b21e2d23a4785f1334f62b9e3 (diff)
downloadmpv-89fd3e1d9d25731c6cae8af1b9c5b0bae726c436.tar.bz2
mpv-89fd3e1d9d25731c6cae8af1b9c5b0bae726c436.tar.xz
command: use scale_units to add/cycle integer properties
This adds check_property_scalable, which returns true if the property is backed by a floating-point number. When the add or cycle commands operate on these properties, they can benefit from the fractional scale value in cmd->scale. When the property is not backed by a floating-point number, cmd->scale_units is used instead, so for axis events, the property is only incrmented when the user scrolls one full unit. This solution isn't perfect, because in some cases integer-backed properties could benefit from accurate scrolling. For example, if an axis is bound to "cycle audio 5", the cycle command could be made to change the audio track by one when the user scrolls 1/5th of a unit, though this behaviour would require more changes to the options system.
Diffstat (limited to 'input/input.h')
-rw-r--r--input/input.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/input/input.h b/input/input.h
index dfc14078f3..c2933e8bd3 100644
--- a/input/input.h
+++ b/input/input.h
@@ -85,6 +85,7 @@ typedef struct mp_cmd {
int mouse_x, mouse_y;
struct mp_cmd *queue_next;
double scale; // for scaling numeric arguments
+ int scale_units;
const struct mp_cmd_def *def;
char *sender; // name of the client API user which sent this
char *key_name; // string representation of the key binding