smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

push2: fix pad colors etc. after layout switches

Browse source
This commit is contained in:
Paul Davis 2022-08-30 21:37:16 -06:00
parent 748fbf6fb1
commit 678ed40bd3
3 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/surfaces/push2/buttons.cc
View file

@ -803,15 +803,15 @@ Push2::button_mix_press ()
{ {
/* toggle between global mix and track mix layouts */ /* toggle between global mix and track mix layouts */
if (_current_layout == _track_mix_layout) { if (_current_layout == _track_mix_layout) {
std::cerr << "go global mix\n";
set_current_layout (_mix_layout); set_current_layout (_mix_layout);
restore_pad_scale ();
} else { } else {
if (ControlProtocol::first_selected_stripable()) { if (ControlProtocol::first_selected_stripable()) {
std::cerr << "go track mix\n";
set_current_layout (_track_mix_layout); set_current_layout (_track_mix_layout);
restore_pad_scale ();
} else { } else {
std::cerr << "go global mix\n";
set_current_layout (_mix_layout); set_current_layout (_mix_layout);
restore_pad_scale ();
} }
} }
} }

30
libs/surfaces/push2/push2.cc
View file

@ -821,11 +821,17 @@ Push2::handle_midi_note_on_message (MIDI::Parser& parser, MIDI::EventTwoBytes* e
return; return;
} }
for (FNPadMap::iterator pi = pads_with_note.first; pi != pads_with_note.second; ++pi) { for (FNPadMap::iterator pi = pads_with_note.first; pi != pads_with_note.second; ++pi) {
boost::shared_ptr<Pad> pad = pi->second; boost::shared_ptr<Pad> pad = pi->second;
pad->set_color (_contrast_color); if (pad->do_when_pressed == Pad::FlashOn) {
pad->set_state (LED::OneShot24th); pad->set_color (_contrast_color);
pad->set_state (LED::OneShot24th);
} else if (pad->do_when_pressed == Pad::FlashOff) {
pad->set_color (LED::Black);
pad->set_state (LED::OneShot24th);
}
write (pad->state_msg()); write (pad->state_msg());
} }
} }
@ -863,18 +869,13 @@ Push2::handle_midi_note_off_message (MIDI::Parser&, MIDI::EventTwoBytes* ev)
return; return;
} }
for (FNPadMap::iterator pi = pads_with_note.first; pi != pads_with_note.second; ++pi) { for (FNPadMap::iterator pi = pads_with_note.first; pi != pads_with_note.second; ++pi) {
boost::shared_ptr<Pad> pad = pi->second; boost::shared_ptr<Pad> pad = pi->second;
if (pad->do_when_pressed == Pad::FlashOn) { pad->set_color (pad->perma_color);
pad->set_color (LED::Black); pad->set_state (LED::NoTransition);
pad->set_state (LED::OneShot24th); write (pad->state_msg());
write (pad->state_msg());
} else if (pad->do_when_pressed == Pad::FlashOff) {
pad->set_color (pad->perma_color);
pad->set_state (LED::OneShot24th);
write (pad->state_msg());
}
} }
} }
@ -1494,6 +1495,12 @@ Push2::set_pad_scale_in_key (const int scale_root,
} }
} }
void
Push2::restore_pad_scale ()
{
set_pad_scale (_scale_root, _root_octave, _mode, _note_grid_origin, _row_interval, _in_key);
}
void void
Push2::set_pad_scale_chromatic (const int scale_root, Push2::set_pad_scale_chromatic (const int scale_root,
const int octave, const int octave,
@ -1567,7 +1574,6 @@ Push2::set_pad_scale (const int scale_root,
for (int col = 0; col < 8; ++col) { for (int col = 0; col < 8; ++col) {
const int index = 36 + (row * 8) + col; const int index = 36 + (row * 8) + col;
const boost::shared_ptr<Pad>& pad = _nn_pad_map[index]; const boost::shared_ptr<Pad>& pad = _nn_pad_map[index];
write (pad->state_msg ()); write (pad->state_msg ());
} }
} }

2
libs/surfaces/push2/push2.h
View file

@ -680,6 +680,8 @@ class Push2 : public ARDOUR::ControlProtocol
int _octave_shift; int _octave_shift;
bool _percussion; bool _percussion;
void restore_pad_scale ();
void set_percussive_mode (bool); void set_percussive_mode (bool);
/* color map (device side) */ /* color map (device side) */