diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-22 14:24:02 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-09-27 14:59:31 -0500 |
| commit | 3aa0676f706ca7d42f341ff71f37704728b3edc7 (patch) | |
| tree | cbcb7c14e86a44f0414419671b0a37349b970cd9 /libs/surfaces/push2/scale.cc | |
| parent | f12150a1edc629aedacf2719f2505315bb82e9d5 (diff) | |
push2: substantial improvements to track mix mode, and a few other details
Diffstat (limited to 'libs/surfaces/push2/scale.cc')
| -rw-r--r-- | libs/surfaces/push2/scale.cc | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/libs/surfaces/push2/scale.cc b/libs/surfaces/push2/scale.cc index 9aa938a470..659d800e5d 100644 --- a/libs/surfaces/push2/scale.cc +++ b/libs/surfaces/push2/scale.cc @@ -81,12 +81,6 @@ ScaleLayout::ScaleLayout (Push2& p, Session& s) chromatic_text->set_color (p2.get_color (Push2::LightBackground)); chromatic_text->set (_("Chromatic")); - fixed_text = new Text (this); - fixed_text->set_font_description (fd2); - fixed_text->set_position (Duple (10 + (7 * Push2Canvas::inter_button_spacing()), 140)); - fixed_text->set_color (p2.get_color (Push2::LightBackground)); - fixed_text->set (_("Fixed")); - for (int n = 0; n < 8; ++n) { /* text labels for root notes etc.*/ @@ -291,15 +285,32 @@ ScaleLayout::button_right () void ScaleLayout::show () { + Push2::Button* b; + last_vpot = -1; + b = p2.button_by_id (Push2::Upper1); + b->set_color (Push2::LED::White); + b->set_state (Push2::LED::OneShot24th); + p2.write (b->state_msg()); + + b = p2.button_by_id (Push2::Upper8); + b->set_color (Push2::LED::White); + b->set_state (Push2::LED::OneShot24th); + p2.write (b->state_msg()); + + b = p2.button_by_id (Push2::Lower1); + b->set_color (Push2::LED::White); + b->set_state (Push2::LED::OneShot24th); + p2.write (b->state_msg()); + /* all root buttons should be dimly lit */ Push2::ButtonID root_buttons[] = { Push2::Upper2, Push2::Upper3, Push2::Upper4, Push2::Upper5, Push2::Upper6, Push2::Upper7, Push2::Lower2, Push2::Lower3, Push2::Lower4, Push2::Lower5, Push2::Lower6, Push2::Lower7, }; for (size_t n = 0; n < sizeof (root_buttons) / sizeof (root_buttons[0]); ++n) { - Push2::Button* b = p2.button_by_id (root_buttons[n]); + b = p2.button_by_id (root_buttons[n]); b->set_color (Push2::LED::DarkGray); b->set_state (Push2::LED::OneShot24th); |