projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
eaf49f0
)
Fix excessive use of logic.
author
nick_m
<mainsbridge@gmail.com>
Thu, 21 May 2015 16:20:51 +0000
(
02:20
+1000)
committer
nick_m
<mainsbridge@gmail.com>
Thu, 21 May 2015 16:20:51 +0000
(
02:20
+1000)
gtk2_ardour/keyboard.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/keyboard.cc
b/gtk2_ardour/keyboard.cc
index 72b9ff1ba404e6c6e037d5d4257a2847eadeb69a..e656ede9dbd02df25cbe84eb9cb4ddd795ef3498 100644
(file)
--- a/
gtk2_ardour/keyboard.cc
+++ b/
gtk2_ardour/keyboard.cc
@@
-239,22
+239,20
@@
bool
ArdourKeyboard::indicates_snap (guint state)
{
bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier());
ArdourKeyboard::indicates_snap (guint state)
{
bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier());
- bool equals_s = Keyboard::modifier_state_equals (state, Keyboard::snap_modifier());
bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier());
bool equals_d = Keyboard::modifier_state_equals (state, Keyboard::snap_delta_modifier());
bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier());
bool equals_d = Keyboard::modifier_state_equals (state, Keyboard::snap_delta_modifier());
- return (
equals_s || (contains_s && ((contains_d && !equals_d) || !contains_d)
));
+ return (
contains_s && ((contains_d && !equals_d) || !contains_d
));
}
bool
ArdourKeyboard::indicates_snap_delta (guint state)
{
bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier());
}
bool
ArdourKeyboard::indicates_snap_delta (guint state)
{
bool contains_d = Keyboard::modifier_state_contains (state, Keyboard::snap_delta_modifier());
- bool equals_d = Keyboard::modifier_state_equals (state, Keyboard::snap_delta_modifier());
bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier());
bool equals_s = Keyboard::modifier_state_equals (state, Keyboard::snap_modifier());
bool contains_s = Keyboard::modifier_state_contains (state, Keyboard::snap_modifier());
bool equals_s = Keyboard::modifier_state_equals (state, Keyboard::snap_modifier());
- return (
equals_d || (contains_d && ((contains_s && !equals_s) || !contains_s)
));
+ return (
contains_d && ((contains_s && !equals_s) || !contains_s
));
}
void
}
void