From bc1876a84b1605e3e23aaacf1484b75af86d5077 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 8 Jul 2016 18:17:34 -0400 Subject: [PATCH] push2: use correct selection API --- libs/surfaces/push2/buttons.cc | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/libs/surfaces/push2/buttons.cc b/libs/surfaces/push2/buttons.cc index 7bcdff0d77..3b519babbf 100644 --- a/libs/surfaces/push2/buttons.cc +++ b/libs/surfaces/push2/buttons.cc @@ -356,7 +356,7 @@ Push2::button_lower (uint32_t n) } if (modifier_state & ModSelect) { - stripable[n]->presentation_info().set_selected (!stripable[n]->presentation_info().selected()); + SetStripableSelection (stripable[n]); } else { boost::shared_ptr mc = stripable[n]->mute_control (); @@ -495,7 +495,7 @@ Push2::button_select_release () /* no visible track selected, select first (if any) */ if (stripable[0]) { - stripable[0]->presentation_info().set_selected (true); + SetStripableSelection (stripable[0]); } } else { @@ -509,10 +509,10 @@ Push2::button_select_release () switch banks by one, and select leftmost */ if (bank_start != 0) { - stripable[selected]->presentation_info().set_selected (false); + ClearStripableSelection (); switch_bank (bank_start-1); if (stripable[0]) { - stripable[0]->presentation_info().set_selected (true); + SetStripableSelection (stripable[0]); } } } else { @@ -522,8 +522,7 @@ Push2::button_select_release () --n; } if (n >= 0) { - stripable[selected]->presentation_info().set_selected (false); - stripable[n]->presentation_info().set_selected (true); + SetStripableSelection (stripable[n]); } } @@ -536,10 +535,10 @@ Push2::button_select_release () /* current selected is rightmost ... cancel selection, switch banks by one, and select righmost */ - stripable[selected]->presentation_info().set_selected (false); + ToggleStripableSelection (stripable[selected]); switch_bank (bank_start+1); if (stripable[7]) { - stripable[7]->presentation_info().set_selected (true); + SetStripableSelection (stripable[7]); } } else { /* select next, if any */ @@ -549,8 +548,7 @@ Push2::button_select_release () } if (n != 8) { - stripable[selected]->presentation_info().set_selected (false); - stripable[n]->presentation_info().set_selected (true); + SetStripableSelection (stripable[n]); } } }