From 86578ea0cc1daef464953fdb80820d40a8167f78 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 10 Jul 2016 08:37:45 -0400 Subject: push2: first somewhat operational versions of menus --- libs/surfaces/push2/buttons.cc | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'libs/surfaces/push2/buttons.cc') 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 (); + } +} -- cgit v1.2.3