summaryrefslogtreecommitdiff
path: root/libs/surfaces/push2/buttons.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-07-10 08:37:45 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-09-27 14:59:30 -0500
commit86578ea0cc1daef464953fdb80820d40a8167f78 (patch)
treeb1f626a0e11f5db70516c59cba9837664a0e953c /libs/surfaces/push2/buttons.cc
parentb37531e04f1f8786ffcc8599759aa93411d42c1b (diff)
push2: first somewhat operational versions of menus
Diffstat (limited to 'libs/surfaces/push2/buttons.cc')
-rw-r--r--libs/surfaces/push2/buttons.cc22
1 files changed, 21 insertions, 1 deletions
diff --git a/libs/surfaces/push2/buttons.cc b/libs/surfaces/push2/buttons.cc
index 6925517f68..8e916d126f 100644
--- a/libs/surfaces/push2/buttons.cc
+++ b/libs/surfaces/push2/buttons.cc
@@ -193,7 +193,7 @@ Push2::build_maps ()
MAKE_WHITE_BUTTON_PRESS (Left, 44, &Push2::button_left);
MAKE_WHITE_BUTTON_PRESS (Repeat, 56, &Push2::button_repeat);
MAKE_WHITE_BUTTON (Accent, 57);
- MAKE_WHITE_BUTTON (Scale, 58);
+ MAKE_WHITE_BUTTON_PRESS (Scale, 58, &Push2::button_scale_press);
MAKE_WHITE_BUTTON_PRESS (Layout, 31, &Push2::button_layout_press);
MAKE_WHITE_BUTTON (Note, 50);
MAKE_WHITE_BUTTON (Session, 51);
@@ -608,3 +608,23 @@ Push2::button_octave_up ()
build_pad_table ();
}
}
+
+void
+Push2::button_layout_press ()
+{
+ if (percussion) {
+ set_percussive_mode (false);
+ } else {
+ set_percussive_mode (true);
+ }
+}
+
+void
+Push2::button_scale_press ()
+{
+ if (current_menu != scale_menu) {
+ show_scale_menu ();
+ } else {
+ cancel_menu ();
+ }
+}