From 3932f07b6b91f27f226a2e93fbdde7e8aac10857 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 17 Jun 2016 15:51:16 -0400 Subject: [PATCH] push2: numerous changes, including long press actions --- libs/surfaces/push2/buttons.cc | 389 +++++++++++++++++++++++++++++++-- libs/surfaces/push2/push2.cc | 342 +++++++++++++---------------- libs/surfaces/push2/push2.h | 43 +++- 3 files changed, 562 insertions(+), 212 deletions(-) diff --git a/libs/surfaces/push2/buttons.cc b/libs/surfaces/push2/buttons.cc index a8aa6d0150..67778ffca4 100644 --- a/libs/surfaces/push2/buttons.cc +++ b/libs/surfaces/push2/buttons.cc @@ -16,6 +16,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include + +#include "ardour/debug.h" #include "ardour/mute_control.h" #include "ardour/session.h" #include "ardour/solo_control.h" @@ -24,10 +27,196 @@ using namespace ArdourSurface; using namespace ARDOUR; +using namespace PBD; +using std::cerr; + +void +Push2::build_maps () +{ + /* Pads */ + + Pad* pad; + +#define MAKE_PAD(x,y,nn) \ + pad = new Pad ((x), (y), (nn)); \ + nn_pad_map.insert (std::make_pair (pad->extra(), pad)); \ + coord_pad_map.insert (std::make_pair (pad->coord(), pad)); + + MAKE_PAD (0, 1, 93); + MAKE_PAD (0, 2, 94); + MAKE_PAD (0, 3, 95); + MAKE_PAD (0, 4, 96); + MAKE_PAD (0, 5, 97); + MAKE_PAD (0, 6, 98); + MAKE_PAD (0, 7, 90); + MAKE_PAD (1, 0, 84); + MAKE_PAD (1, 1, 85); + MAKE_PAD (1, 2, 86); + MAKE_PAD (1, 3, 87); + MAKE_PAD (1, 4, 88); + MAKE_PAD (1, 5, 89); + MAKE_PAD (1, 6, 90); + MAKE_PAD (1, 7, 91); + MAKE_PAD (2, 0, 76); + MAKE_PAD (2, 1, 77); + MAKE_PAD (2, 2, 78); + MAKE_PAD (2, 3, 79); + MAKE_PAD (2, 4, 80); + MAKE_PAD (2, 5, 81); + MAKE_PAD (2, 6, 82); + MAKE_PAD (2, 7, 83); + MAKE_PAD (3, 0, 68); + MAKE_PAD (3, 1, 69); + MAKE_PAD (3, 2, 70); + MAKE_PAD (3, 3, 71); + MAKE_PAD (3, 4, 72); + MAKE_PAD (3, 5, 73); + MAKE_PAD (3, 6, 74); + MAKE_PAD (3, 7, 75); + MAKE_PAD (4, 0, 60); + MAKE_PAD (4, 1, 61); + MAKE_PAD (4, 2, 62); + MAKE_PAD (4, 3, 63); + MAKE_PAD (4, 4, 64); + MAKE_PAD (4, 5, 65); + MAKE_PAD (4, 6, 66); + MAKE_PAD (4, 7, 67); + MAKE_PAD (5, 0, 52); + MAKE_PAD (5, 1, 53); + MAKE_PAD (5, 2, 54); + MAKE_PAD (5, 3, 56); + MAKE_PAD (5, 4, 56); + MAKE_PAD (5, 5, 57); + MAKE_PAD (5, 6, 58); + MAKE_PAD (5, 7, 59); + MAKE_PAD (6, 0, 44); + MAKE_PAD (6, 1, 45); + MAKE_PAD (6, 2, 46); + MAKE_PAD (6, 3, 47); + MAKE_PAD (6, 4, 48); + MAKE_PAD (6, 5, 49); + MAKE_PAD (6, 6, 50); + MAKE_PAD (6, 7, 51); + MAKE_PAD (7, 0, 36); + MAKE_PAD (7, 1, 37); + MAKE_PAD (7, 2, 38); + MAKE_PAD (7, 3, 39); + MAKE_PAD (7, 4, 40); + MAKE_PAD (7, 5, 41); + MAKE_PAD (7, 6, 42); + MAKE_PAD (7, 7, 43); + + /* Now color buttons */ + + Button *button; + +#define MAKE_COLOR_BUTTON(i,cc) \ + button = new ColorButton ((i), (cc)); \ + cc_button_map.insert (std::make_pair (button->controller_number(), button)); \ + id_button_map.insert (std::make_pair (button->id, button)); +#define MAKE_COLOR_BUTTON_PRESS(i,cc,p)\ + button = new ColorButton ((i), (cc), (p)); \ + cc_button_map.insert (std::make_pair (button->controller_number(), button)); \ + id_button_map.insert (std::make_pair (button->id, button)) + + MAKE_COLOR_BUTTON_PRESS (Upper1, 102, &Push2::button_upper_1); + MAKE_COLOR_BUTTON_PRESS (Upper2, 103, &Push2::button_upper_2); + MAKE_COLOR_BUTTON_PRESS (Upper3, 104, &Push2::button_upper_3); + MAKE_COLOR_BUTTON_PRESS (Upper4, 105, &Push2::button_upper_4); + MAKE_COLOR_BUTTON_PRESS (Upper5, 106, &Push2::button_upper_5); + MAKE_COLOR_BUTTON_PRESS (Upper6, 107, &Push2::button_upper_6); + MAKE_COLOR_BUTTON_PRESS (Upper7, 108, &Push2::button_upper_7); + MAKE_COLOR_BUTTON_PRESS (Upper8, 109, &Push2::button_upper_8); + MAKE_COLOR_BUTTON_PRESS (Lower1, 20, &Push2::button_lower_1); + MAKE_COLOR_BUTTON_PRESS (Lower2, 21, &Push2::button_lower_2); + MAKE_COLOR_BUTTON_PRESS (Lower3, 22, &Push2::button_lower_3); + MAKE_COLOR_BUTTON_PRESS (Lower4, 23, &Push2::button_lower_4); + MAKE_COLOR_BUTTON_PRESS (Lower5, 24, &Push2::button_lower_5); + MAKE_COLOR_BUTTON_PRESS (Lower6, 25, &Push2::button_lower_6); + MAKE_COLOR_BUTTON_PRESS (Lower7, 26, &Push2::button_lower_7); + MAKE_COLOR_BUTTON_PRESS (Lower8, 27, &Push2::button_lower_8); + MAKE_COLOR_BUTTON (Master, 28); + MAKE_COLOR_BUTTON (Mute, 60); + MAKE_COLOR_BUTTON_PRESS (Solo, 61, &Push2::button_solo); + MAKE_COLOR_BUTTON_PRESS (Stop, 29, &Push2::button_stop); + MAKE_COLOR_BUTTON_PRESS (Fwd32ndT, 43, &Push2::button_fwd32t); + MAKE_COLOR_BUTTON_PRESS (Fwd32nd,42 , &Push2::button_fwd32); + MAKE_COLOR_BUTTON_PRESS (Fwd16thT, 41, &Push2::button_fwd16t); + MAKE_COLOR_BUTTON_PRESS (Fwd16th, 40, &Push2::button_fwd16); + MAKE_COLOR_BUTTON_PRESS (Fwd8thT, 39 , &Push2::button_fwd8t); + MAKE_COLOR_BUTTON_PRESS (Fwd8th, 38, &Push2::button_fwd8); + MAKE_COLOR_BUTTON_PRESS (Fwd4trT, 37, &Push2::button_fwd4t); + MAKE_COLOR_BUTTON_PRESS (Fwd4tr, 36, &Push2::button_fwd4); + MAKE_COLOR_BUTTON (Automate, 89); + MAKE_COLOR_BUTTON_PRESS (RecordEnable, 86, &Push2::button_recenable); + MAKE_COLOR_BUTTON_PRESS (Play, 85, &Push2::button_play); + +#define MAKE_WHITE_BUTTON(i,cc)\ + button = new WhiteButton ((i), (cc)); \ + cc_button_map.insert (std::make_pair (button->controller_number(), button)); \ + id_button_map.insert (std::make_pair (button->id, button)) +#define MAKE_WHITE_BUTTON_PRESS(i,cc,p)\ + button = new WhiteButton ((i), (cc), (p)); \ + cc_button_map.insert (std::make_pair (button->controller_number(), button)); \ + id_button_map.insert (std::make_pair (button->id, button)) +#define MAKE_WHITE_BUTTON_PRESS_RELEASE(i,cc,p,r) \ + button = new WhiteButton ((i), (cc), (p), (r)); \ + cc_button_map.insert (std::make_pair (button->controller_number(), button)); \ + id_button_map.insert (std::make_pair (button->id, button)) +#define MAKE_WHITE_BUTTON_PRESS_RELEASE_LONG(i,cc,p,r,l) \ + button = new WhiteButton ((i), (cc), (p), (r), (l)); \ + cc_button_map.insert (std::make_pair (button->controller_number(), button)); \ + id_button_map.insert (std::make_pair (button->id, button)) + + MAKE_WHITE_BUTTON (TapTempo, 3); + MAKE_WHITE_BUTTON_PRESS (Metronome, 9, &Push2::button_metronome); + MAKE_WHITE_BUTTON (Setup, 30); + MAKE_WHITE_BUTTON (User, 59); + MAKE_WHITE_BUTTON (Delete, 118); + MAKE_WHITE_BUTTON (AddDevice, 52); + MAKE_WHITE_BUTTON (Device, 110); + MAKE_WHITE_BUTTON (Mix, 112); + MAKE_WHITE_BUTTON_PRESS (Undo, 119, &Push2::button_undo); + MAKE_WHITE_BUTTON_PRESS (AddTrack, 53, &Push2::button_add_track); + MAKE_WHITE_BUTTON_PRESS (Browse, 111, &Push2::button_browse); + MAKE_WHITE_BUTTON_PRESS (Clip, 113, &Push2::button_clip); + MAKE_WHITE_BUTTON (Convert, 35); + MAKE_WHITE_BUTTON (DoubleLoop, 117); + MAKE_WHITE_BUTTON (Quantize, 116); + MAKE_WHITE_BUTTON (Duplicate, 88); + MAKE_WHITE_BUTTON_PRESS (New, 87, &Push2::button_new); + MAKE_WHITE_BUTTON_PRESS (FixedLength, 90, &Push2::button_fixed_length); + MAKE_WHITE_BUTTON_PRESS (Up, 46, &Push2::button_up); + MAKE_WHITE_BUTTON_PRESS (Right, 45, &Push2::button_right); + MAKE_WHITE_BUTTON_PRESS (Down, 47, &Push2::button_down); + 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 (Layout, 31); + MAKE_WHITE_BUTTON (Note, 50); + MAKE_WHITE_BUTTON (Session, 51); + MAKE_WHITE_BUTTON (Layout, 31); + MAKE_WHITE_BUTTON (OctaveUp, 55); + MAKE_WHITE_BUTTON (PageRight, 63); + MAKE_WHITE_BUTTON (OctaveDown, 54); + MAKE_WHITE_BUTTON (PageLeft, 62); + MAKE_WHITE_BUTTON_PRESS_RELEASE_LONG (Shift, 49, &Push2::button_shift_press, &Push2::button_shift_release, &Push2::button_shift_long_press); + MAKE_WHITE_BUTTON_PRESS_RELEASE_LONG (Select, 48, &Push2::button_select_press, &Push2::button_select_release, &Push2::button_select_long_press); +} void Push2::button_play () { + if (!session) { + return; + } + + if (modifier_state & ModShift) { + goto_start (session->transport_rolling()); + return; + } + if (session->transport_rolling ()) { transport_stop (); } else { @@ -115,22 +304,14 @@ Push2::button_fixed_length () write (id_button_map[FixedLength]->state_msg()); } -void -Push2::button_shift_press () -{ - modifier_state = ModifierState (modifier_state | ModShift); -} - -void -Push2::button_shift_release () -{ - modifier_state = ModifierState (modifier_state & ~ModShift); -} - void Push2::button_browse () { - switch_bank (max (0, bank_start - 8)); + if (modifier_state & ModShift) { + access_action ("Editor/addExistingAudioFiles"); + } else { + switch_bank (max (0, bank_start - 8)); + } } void @@ -146,9 +327,16 @@ Push2::button_upper (uint32_t n) return; } - boost::shared_ptr sc = stripable[n]->solo_control (); - if (sc) { - sc->set_value (!sc->get_value(), PBD::Controllable::UseGroup); + if (modifier_state & ModShift) { + boost::shared_ptr sc = stripable[n]->rec_enable_control (); + if (sc) { + sc->set_value (!sc->get_value(), PBD::Controllable::UseGroup); + } + } else { + boost::shared_ptr sc = stripable[n]->solo_control (); + if (sc) { + sc->set_value (!sc->get_value(), PBD::Controllable::UseGroup); + } } } @@ -159,10 +347,15 @@ Push2::button_lower (uint32_t n) return; } - boost::shared_ptr mc = stripable[n]->mute_control (); + if (modifier_state & ModSelect) { + stripable[n]->presentation_info().set_selected (!stripable[n]->presentation_info().selected()); + } else { + cerr << "select not set\n"; + boost::shared_ptr mc = stripable[n]->mute_control (); - if (mc) { - mc->set_value (!mc->get_value(), PBD::Controllable::UseGroup); + if (mc) { + mc->set_value (!mc->get_value(), PBD::Controllable::UseGroup); + } } } @@ -232,3 +425,161 @@ Push2::button_fwd4 () goto_nth_marker (7+n); } +void +Push2::button_add_track () +{ + access_action ("Main/AddTrackBus"); +} + +void +Push2::button_stop () +{ + /* close current window */ + access_action ("Main/close-current-dialog"); +} + +void +Push2::button_shift_press () +{ + start_shift (); +} + +void +Push2::button_shift_release () +{ + end_shift (); +} + +void +Push2::button_shift_long_press () +{ + access_action ("Main/close-current-dialog"); +} + +void +Push2::button_select_press () +{ + start_select (); +} + +void +Push2::button_select_release () +{ + if (!(modifier_state & ModSelect)) { + /* somebody else used us as a modifier */ + return; + } + + end_select (); + + int selected = -1; + + for (int n = 0; n < 8; ++n) { + if (stripable[n]) { + if (stripable[n]->presentation_info().selected()) { + selected = n; + break; + } + } + } + + if (selected < 0) { + + /* no visible track selected, select first (if any) */ + + if (stripable[0]) { + stripable[0]->presentation_info().set_selected (true); + } + + } else { + + if (modifier_state & ModShift) { + std::cerr << "select prev\n"; + /* select prev */ + + if (selected == 0) { + /* current selected is leftmost ... cancel selection, + switch banks by one, and select leftmost + */ + if (bank_start != 0) { + stripable[selected]->presentation_info().set_selected (false); + switch_bank (bank_start-1); + if (stripable[0]) { + stripable[0]->presentation_info().set_selected (true); + } + } + } else { + /* select prev, if any */ + int n = selected - 1; + while (n >= 0 && !stripable[n]) { + --n; + } + if (n >= 0) { + stripable[selected]->presentation_info().set_selected (false); + stripable[n]->presentation_info().set_selected (true); + } + } + + } else { + + std::cerr << "select next\n"; + /* select next */ + + if (selected == 7) { + /* current selected is rightmost ... cancel selection, + switch banks by one, and select righmost + */ + stripable[selected]->presentation_info().set_selected (false); + switch_bank (bank_start+1); + if (stripable[7]) { + stripable[7]->presentation_info().set_selected (true); + } + } else { + /* select next, if any */ + int n = selected + 1; + while (n < 8 && !stripable[n]) { + ++n; + } + + if (n != 8) { + stripable[selected]->presentation_info().set_selected (false); + stripable[n]->presentation_info().set_selected (true); + } + } + } + } +} + +void +Push2::button_select_long_press () +{ + access_action ("Main/Escape"); +} + +bool +Push2::button_long_press_timeout (ButtonID id) +{ + if (buttons_down.find (id) != buttons_down.end()) { + DEBUG_TRACE (DEBUG::Push2, string_compose ("long press timeout for %1, invoking method\n", id)); + Button* button = id_button_map[id]; + (this->*button->long_press_method) (); + } else { + DEBUG_TRACE (DEBUG::Push2, string_compose ("long press timeout for %1, expired/cancelled\n", id)); + /* release happened and somehow we were not cancelled */ + } + + /* whichever button this was, we've used it ... don't invoke the + release action. + */ + consumed.insert (id); + + return false; /* don't get called again */ +} + +void +Push2::start_press_timeout (Button& button, ButtonID id) +{ + Glib::RefPtr timeout = Glib::TimeoutSource::create (500); // milliseconds + button.timeout_connection = timeout->connect (sigc::bind (sigc::mem_fun (*this, &Push2::button_long_press_timeout), id)); + timeout->attach (main_loop()->get_context()); +} diff --git a/libs/surfaces/push2/push2.cc b/libs/surfaces/push2/push2.cc index 5be31c2f12..897fd8a05a 100644 --- a/libs/surfaces/push2/push2.cc +++ b/libs/surfaces/push2/push2.cc @@ -188,9 +188,13 @@ Push2::close () void Push2::init_buttons (bool startup) { + /* This is a list of buttons that we want lit because they do something + in ardour related (loosely, sometimes) to their illuminated label. + */ + ButtonID buttons[] = { Mute, Solo, Master, Up, Right, Left, Down, Note, Session, Mix, AddTrack, Delete, Undo, Metronome, Shift, Select, Play, RecordEnable, Automate, Repeat, Note, Session, DoubleLoop, - Quantize, Duplicate, + Quantize, Duplicate, Browse, }; for (size_t n = 0; n < sizeof (buttons) / sizeof (buttons[0]); ++n) { @@ -205,8 +209,12 @@ Push2::init_buttons (bool startup) write (b->state_msg()); } + /* Strip buttons should all be off (black) by default. They will change + * color to reflect various conditions + */ + ButtonID strip_buttons[] = { Upper1, Upper2, Upper3, Upper4, Upper5, Upper6, Upper7, Upper8, - Lower1, Lower2, Lower3, Lower4, Lower5, Lower6, Lower7, Lower8 }; + Lower1, Lower2, Lower3, Lower4, Lower5, Lower6, Lower7, Lower8, }; for (size_t n = 0; n < sizeof (strip_buttons) / sizeof (strip_buttons[0]); ++n) { Button* b = id_button_map[strip_buttons[n]]; @@ -215,6 +223,24 @@ Push2::init_buttons (bool startup) b->set_state (LED::OneShot24th); write (b->state_msg()); } + + if (startup) { + + /* all other buttons are off (black) */ + + ButtonID off_buttons[] = { TapTempo, Setup, User, Stop, Convert, New, FixedLength, + Fwd32ndT, Fwd32nd, Fwd16thT, Fwd16th, Fwd8thT, Fwd8th, Fwd4trT, Fwd4tr, + Accent, Scale, Layout, Note, Session, OctaveUp, PageRight, OctaveDown, PageLeft, }; + + for (size_t n = 0; n < sizeof (off_buttons) / sizeof (off_buttons[0]); ++n) { + Button* b = id_button_map[off_buttons[n]]; + + b->set_color (LED::Black); + b->set_state (LED::OneShot24th); + write (b->state_msg()); + } + } + } bool @@ -272,7 +298,7 @@ Push2::stop () */ int -Push2::bitblt_to_device_frame_buffer () +Push2::blit_to_device_frame_buffer () { /* ensure that all drawing has been done before we fetch pixel data */ @@ -302,6 +328,12 @@ Push2::bitblt_to_device_frame_buffer () *fb++ = (r >> 3) | ((g & 0xfc) << 3) | ((b & 0xf8) << 8); + /* the push2 docs state that we should xor the pixel + * data. Doing so doesn't work correctly, and not doing + * so seems to work fine (colors roughly match intended + * values). + */ + dp += 4; } @@ -405,8 +437,13 @@ Push2::redraw () } for (int n = 0; n < 8; ++n) { - context->move_to (10 + (n*120), 120); + if (stripable[n] && stripable[n]->presentation_info().selected()) { + context->rectangle (10 + (n*120) - 5, 115, 120, 22); + context->set_source_rgb (1.0, 0.737, 0.172); + context->fill(); + } context->set_source_rgb (0.0, 0.0, 0.0); + context->move_to (10 + (n*120), 120); mid_layout[n]->update_from_cairo_context (context); mid_layout[n]->show_in_cairo_context (context); } @@ -431,7 +468,7 @@ Push2::vblank () if (redraw()) { /* things changed */ - bitblt_to_device_frame_buffer (); + blit_to_device_frame_buffer (); } if ((err = libusb_bulk_transfer (handle, 0x01, (uint8_t*) device_frame_buffer , 2 * rows * pixels_per_row, &transferred, timeout_msecs))) { @@ -520,7 +557,6 @@ Push2::init_touch_strip () void Push2::write (const MidiByteArray& data) { - cerr << data << endl; /* immediate delivery */ _output_port->write (&data[0], data.size(), 0); } @@ -578,20 +614,50 @@ Push2::connect_to_parser () void Push2::handle_midi_sysex (MIDI::Parser&, MIDI::byte* raw_bytes, size_t sz) { - cerr << "sysex, " << sz << " bytes\n"; + DEBUG_TRACE (DEBUG::Push2, string_compose ("Sysex, %1 bytes\n", sz)); } void Push2::handle_midi_controller_message (MIDI::Parser&, MIDI::EventTwoBytes* ev) { + DEBUG_TRACE (DEBUG::Push2, string_compose ("CC %1 (value %2)\n", (int) ev->controller_number, (int) ev->value)); + CCButtonMap::iterator b = cc_button_map.find (ev->controller_number); + if (ev->value) { + /* any press cancels any pending long press timeouts */ + for (set::iterator x = buttons_down.begin(); x != buttons_down.end(); ++x) { + Button* bb = id_button_map[*x]; + bb->timeout_connection.disconnect (); + } + } + if (b != cc_button_map.end()) { - if (ev->value == 0) { - (this->*b->second->release_method)(); + + Button* button = b->second; + + if (ev->value) { + buttons_down.insert (button->id); + start_press_timeout (*button, button->id); + } else { + buttons_down.erase (button->id); + button->timeout_connection.disconnect (); + } + + + set::iterator c = consumed.find (button->id); + + if (c == consumed.end()) { + if (ev->value == 0) { + (this->*button->release_method)(); + } else { + (this->*button->press_method)(); + } } else { - (this->*b->second->press_method)(); + DEBUG_TRACE (DEBUG::Push2, "button was consumed, ignored\n"); + consumed.erase (c); } + } else { /* encoder/vpot */ @@ -647,6 +713,8 @@ Push2::handle_midi_controller_message (MIDI::Parser&, MIDI::EventTwoBytes* ev) void Push2::handle_midi_note_on_message (MIDI::Parser&, MIDI::EventTwoBytes* ev) { + DEBUG_TRACE (DEBUG::Push2, string_compose ("Note On %1 (velocity %2)\n", (int) ev->note_number, (int) ev->velocity)); + switch (ev->note_number) { case 0: strip_vpot_touch (0, ev->velocity > 64); @@ -693,12 +761,12 @@ Push2::handle_midi_note_on_message (MIDI::Parser&, MIDI::EventTwoBytes* ev) } break; } - } void Push2::handle_midi_note_off_message (MIDI::Parser&, MIDI::EventTwoBytes* ev) { + DEBUG_TRACE (DEBUG::Push2, string_compose ("Note Off %1 (velocity %2)\n", (int) ev->note_number, (int) ev->velocity)); } void @@ -707,6 +775,7 @@ Push2::handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t pb) if (!session) { return; } + float speed; /* range of +1 .. -1 */ @@ -715,177 +784,6 @@ Push2::handle_midi_pitchbend_message (MIDI::Parser&, MIDI::pitchbend_t pb) session->request_transport_speed (speed * 3.0); } -void -Push2::build_maps () -{ - /* Pads */ - - Pad* pad; - -#define MAKE_PAD(x,y,nn) \ - pad = new Pad ((x), (y), (nn)); \ - nn_pad_map.insert (make_pair (pad->extra(), pad)); \ - coord_pad_map.insert (make_pair (pad->coord(), pad)); - - MAKE_PAD (0, 1, 93); - MAKE_PAD (0, 2, 94); - MAKE_PAD (0, 3, 95); - MAKE_PAD (0, 4, 96); - MAKE_PAD (0, 5, 97); - MAKE_PAD (0, 6, 98); - MAKE_PAD (0, 7, 90); - MAKE_PAD (1, 0, 84); - MAKE_PAD (1, 1, 85); - MAKE_PAD (1, 2, 86); - MAKE_PAD (1, 3, 87); - MAKE_PAD (1, 4, 88); - MAKE_PAD (1, 5, 89); - MAKE_PAD (1, 6, 90); - MAKE_PAD (1, 7, 91); - MAKE_PAD (2, 0, 76); - MAKE_PAD (2, 1, 77); - MAKE_PAD (2, 2, 78); - MAKE_PAD (2, 3, 79); - MAKE_PAD (2, 4, 80); - MAKE_PAD (2, 5, 81); - MAKE_PAD (2, 6, 82); - MAKE_PAD (2, 7, 83); - MAKE_PAD (3, 0, 68); - MAKE_PAD (3, 1, 69); - MAKE_PAD (3, 2, 70); - MAKE_PAD (3, 3, 71); - MAKE_PAD (3, 4, 72); - MAKE_PAD (3, 5, 73); - MAKE_PAD (3, 6, 74); - MAKE_PAD (3, 7, 75); - MAKE_PAD (4, 0, 60); - MAKE_PAD (4, 1, 61); - MAKE_PAD (4, 2, 62); - MAKE_PAD (4, 3, 63); - MAKE_PAD (4, 4, 64); - MAKE_PAD (4, 5, 65); - MAKE_PAD (4, 6, 66); - MAKE_PAD (4, 7, 67); - MAKE_PAD (5, 0, 52); - MAKE_PAD (5, 1, 53); - MAKE_PAD (5, 2, 54); - MAKE_PAD (5, 3, 56); - MAKE_PAD (5, 4, 56); - MAKE_PAD (5, 5, 57); - MAKE_PAD (5, 6, 58); - MAKE_PAD (5, 7, 59); - MAKE_PAD (6, 0, 44); - MAKE_PAD (6, 1, 45); - MAKE_PAD (6, 2, 46); - MAKE_PAD (6, 3, 47); - MAKE_PAD (6, 4, 48); - MAKE_PAD (6, 5, 49); - MAKE_PAD (6, 6, 50); - MAKE_PAD (6, 7, 51); - MAKE_PAD (7, 0, 36); - MAKE_PAD (7, 1, 37); - MAKE_PAD (7, 2, 38); - MAKE_PAD (7, 3, 39); - MAKE_PAD (7, 4, 40); - MAKE_PAD (7, 5, 41); - MAKE_PAD (7, 6, 42); - MAKE_PAD (7, 7, 43); - - /* Now color buttons */ - - Button *button; - -#define MAKE_COLOR_BUTTON(i,cc) \ - button = new ColorButton ((i), (cc)); \ - cc_button_map.insert (make_pair (button->controller_number(), button)); \ - id_button_map.insert (make_pair (button->id, button)); -#define MAKE_COLOR_BUTTON_PRESS(i,cc,p)\ - button = new ColorButton ((i), (cc), (p)); \ - cc_button_map.insert (make_pair (button->controller_number(), button)); \ - id_button_map.insert (make_pair (button->id, button)) - - MAKE_COLOR_BUTTON_PRESS (Upper1, 102, &Push2::button_upper_1); - MAKE_COLOR_BUTTON_PRESS (Upper2, 103, &Push2::button_upper_2); - MAKE_COLOR_BUTTON_PRESS (Upper3, 104, &Push2::button_upper_3); - MAKE_COLOR_BUTTON_PRESS (Upper4, 105, &Push2::button_upper_4); - MAKE_COLOR_BUTTON_PRESS (Upper5, 106, &Push2::button_upper_5); - MAKE_COLOR_BUTTON_PRESS (Upper6, 107, &Push2::button_upper_6); - MAKE_COLOR_BUTTON_PRESS (Upper7, 108, &Push2::button_upper_7); - MAKE_COLOR_BUTTON_PRESS (Upper8, 109, &Push2::button_upper_8); - MAKE_COLOR_BUTTON_PRESS (Lower1, 20, &Push2::button_lower_1); - MAKE_COLOR_BUTTON_PRESS (Lower2, 21, &Push2::button_lower_2); - MAKE_COLOR_BUTTON_PRESS (Lower3, 22, &Push2::button_lower_3); - MAKE_COLOR_BUTTON_PRESS (Lower4, 23, &Push2::button_lower_4); - MAKE_COLOR_BUTTON_PRESS (Lower5, 24, &Push2::button_lower_5); - MAKE_COLOR_BUTTON_PRESS (Lower6, 25, &Push2::button_lower_6); - MAKE_COLOR_BUTTON_PRESS (Lower7, 26, &Push2::button_lower_7); - MAKE_COLOR_BUTTON_PRESS (Lower8, 27, &Push2::button_lower_8); - MAKE_COLOR_BUTTON (Master, 28); - MAKE_COLOR_BUTTON (Mute, 60); - MAKE_COLOR_BUTTON_PRESS (Solo, 61, &Push2::button_solo); - MAKE_COLOR_BUTTON (Stop, 29); - MAKE_COLOR_BUTTON_PRESS (Fwd32ndT, 43, &Push2::button_fwd32t); - MAKE_COLOR_BUTTON_PRESS (Fwd32nd,42 , &Push2::button_fwd32); - MAKE_COLOR_BUTTON_PRESS (Fwd16thT, 41, &Push2::button_fwd16t); - MAKE_COLOR_BUTTON_PRESS (Fwd16th, 40, &Push2::button_fwd16); - MAKE_COLOR_BUTTON_PRESS (Fwd8thT, 39 , &Push2::button_fwd8t); - MAKE_COLOR_BUTTON_PRESS (Fwd8th, 38, &Push2::button_fwd8); - MAKE_COLOR_BUTTON_PRESS (Fwd4trT, 37, &Push2::button_fwd4t); - MAKE_COLOR_BUTTON_PRESS (Fwd4tr, 36, &Push2::button_fwd4); - MAKE_COLOR_BUTTON (Automate, 89); - MAKE_COLOR_BUTTON_PRESS (RecordEnable, 86, &Push2::button_recenable); - MAKE_COLOR_BUTTON_PRESS (Play, 85, &Push2::button_play); - -#define MAKE_WHITE_BUTTON(i,cc)\ - button = new WhiteButton ((i), (cc)); \ - cc_button_map.insert (make_pair (button->controller_number(), button)); \ - id_button_map.insert (make_pair (button->id, button)) -#define MAKE_WHITE_BUTTON_PRESS(i,cc,p)\ - button = new WhiteButton ((i), (cc), (p)); \ - cc_button_map.insert (make_pair (button->controller_number(), button)); \ - id_button_map.insert (make_pair (button->id, button)) -#define MAKE_WHITE_BUTTON_PRESS_RELEASE(i,cc,p,r) \ - button = new WhiteButton ((i), (cc), (p), (r)); \ - cc_button_map.insert (make_pair (button->controller_number(), button)); \ - id_button_map.insert (make_pair (button->id, button)) - - MAKE_WHITE_BUTTON (TapTempo, 3); - MAKE_WHITE_BUTTON_PRESS (Metronome, 9, &Push2::button_metronome); - MAKE_WHITE_BUTTON (Setup, 30); - MAKE_WHITE_BUTTON (User, 59); - MAKE_WHITE_BUTTON (Delete, 118); - MAKE_WHITE_BUTTON (AddDevice, 52); - MAKE_WHITE_BUTTON (Device, 110); - MAKE_WHITE_BUTTON (Mix, 112); - MAKE_WHITE_BUTTON_PRESS (Undo, 119, &Push2::button_undo); - MAKE_WHITE_BUTTON (AddTrack, 53); - MAKE_WHITE_BUTTON_PRESS (Browse, 111, &Push2::button_browse); - MAKE_WHITE_BUTTON_PRESS (Clip, 113, &Push2::button_clip); - MAKE_WHITE_BUTTON (Convert, 35); - MAKE_WHITE_BUTTON (DoubleLoop, 117); - MAKE_WHITE_BUTTON (Quantize, 116); - MAKE_WHITE_BUTTON (Duplicate, 88); - MAKE_WHITE_BUTTON_PRESS (New, 87, &Push2::button_new); - MAKE_WHITE_BUTTON_PRESS (FixedLength, 90, &Push2::button_fixed_length); - MAKE_WHITE_BUTTON_PRESS (Up, 46, &Push2::button_up); - MAKE_WHITE_BUTTON_PRESS (Right, 45, &Push2::button_right); - MAKE_WHITE_BUTTON_PRESS (Down, 47, &Push2::button_down); - 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 (Layout, 31); - MAKE_WHITE_BUTTON (Note, 50); - MAKE_WHITE_BUTTON (Session, 51); - MAKE_WHITE_BUTTON (Layout, 31); - MAKE_WHITE_BUTTON (OctaveUp, 55); - MAKE_WHITE_BUTTON (PageRight, 63); - MAKE_WHITE_BUTTON (OctaveDown, 54); - MAKE_WHITE_BUTTON (PageLeft, 62); - MAKE_WHITE_BUTTON_PRESS_RELEASE (Shift, 49, &Push2::button_shift_press, &Push2::button_shift_release); - MAKE_WHITE_BUTTON (Select, 48); -} - void Push2::thread_init () { @@ -1077,7 +975,7 @@ Push2::switch_bank (uint32_t base) /* try to get the first stripable for the requested bank */ - stripable[0] = session->get_nth_stripable (base+0); + stripable[0] = session->get_remote_nth_stripable (base, PresentationInfo::Flag (PresentationInfo::Route|PresentationInfo::VCA)); if (!stripable[0]) { return; @@ -1086,13 +984,14 @@ Push2::switch_bank (uint32_t base) /* at least one stripable in this bank */ bank_start = base; - stripable[1] = session->get_nth_stripable (base+1); - stripable[2] = session->get_nth_stripable (base+2); - stripable[3] = session->get_nth_stripable (base+3); - stripable[4] = session->get_nth_stripable (base+4); - stripable[5] = session->get_nth_stripable (base+5); - stripable[6] = session->get_nth_stripable (base+6); - stripable[7] = session->get_nth_stripable (base+7); + stripable[1] = session->get_remote_nth_stripable (base+1, PresentationInfo::Flag (PresentationInfo::Route|PresentationInfo::VCA)); + stripable[2] = session->get_remote_nth_stripable (base+2, PresentationInfo::Flag (PresentationInfo::Route|PresentationInfo::VCA)); + stripable[3] = session->get_remote_nth_stripable (base+3, PresentationInfo::Flag (PresentationInfo::Route|PresentationInfo::VCA)); + stripable[4] = session->get_remote_nth_stripable (base+4, PresentationInfo::Flag (PresentationInfo::Route|PresentationInfo::VCA)); + stripable[5] = session->get_remote_nth_stripable (base+5, PresentationInfo::Flag (PresentationInfo::Route|PresentationInfo::VCA)); + stripable[6] = session->get_remote_nth_stripable (base+6, PresentationInfo::Flag (PresentationInfo::Route|PresentationInfo::VCA)); + stripable[7] = session->get_remote_nth_stripable (base+7, PresentationInfo::Flag (PresentationInfo::Route|PresentationInfo::VCA)); + for (int n = 0; n < 8; ++n) { if (!stripable[n]) { @@ -1112,6 +1011,8 @@ Push2::switch_bank (uint32_t base) mc->Changed.connect (stripable_connections, MISSING_INVALIDATOR, boost::bind (&Push2::mute_change, this, n), this); } + stripable[n]->presentation_info().PropertyChanged.connect (stripable_connections, MISSING_INVALIDATOR, boost::bind (&Push2::stripable_property_change, this, _1, n), this); + solo_change (n); mute_change (n); @@ -1121,6 +1022,17 @@ Push2::switch_bank (uint32_t base) master = session->master_out (); } +void +Push2::stripable_property_change (PropertyChange const& what_changed, int which) +{ + if (what_changed.contains (Properties::selected)) { + /* cancel string, which will cause a redraw on the next update + * cycle. The redraw will reflect selected status + */ + mid_layout[which]->set_text (string()); + } +} + void Push2::solo_change (int n) { @@ -1287,3 +1199,53 @@ Push2::other_vpot_touch (int n, bool touching) } } } + +void +Push2::start_shift () +{ + cerr << "start shift\n"; + modifier_state = ModifierState (modifier_state | ModShift); + Button* b = id_button_map[Shift]; + b->set_color (LED::White); + b->set_state (LED::Blinking16th); + write (b->state_msg()); +} + +void +Push2::end_shift () +{ + if (modifier_state & ModShift) { + cerr << "end shift\n"; + modifier_state = ModifierState (modifier_state & ~(ModShift)); + Button* b = id_button_map[Shift]; + b->timeout_connection.disconnect (); + b->set_color (LED::White); + b->set_state (LED::OneShot24th); + write (b->state_msg()); + } +} + +void +Push2::start_select () +{ + cerr << "start select\n"; + modifier_state = ModifierState (modifier_state | ModSelect); + Button* b = id_button_map[Select]; + b->set_color (LED::White); + b->set_state (LED::Blinking16th); + write (b->state_msg()); +} + +void +Push2::end_select () +{ + if (modifier_state & ModSelect) { + cerr << "end select\n"; + modifier_state = ModifierState (modifier_state & ~(ModSelect)); + Button* b = id_button_map[Select]; + b->timeout_connection.disconnect (); + b->set_color (LED::White); + b->set_state (LED::OneShot24th); + write (b->state_msg()); + } +} diff --git a/libs/surfaces/push2/push2.h b/libs/surfaces/push2/push2.h index 1763750817..11599b7b74 100644 --- a/libs/surfaces/push2/push2.h +++ b/libs/surfaces/push2/push2.h @@ -89,6 +89,7 @@ class Push2 : public ARDOUR::ControlProtocol enum ModifierState { None = 0, ModShift = 0x1, + ModSelect = 0x2, }; ModifierState modifier_state; @@ -102,7 +103,7 @@ class Push2 : public ARDOUR::ControlProtocol int open (); int close (); bool redraw (); - int bitblt_to_device_frame_buffer (); + int blit_to_device_frame_buffer (); bool vblank (); enum ButtonID { @@ -229,6 +230,7 @@ class Push2 : public ARDOUR::ControlProtocol , id (bb) , press_method (&Push2::relax) , release_method (&Push2::relax) + , long_press_method (&Push2::relax) {} Button (ButtonID bb, uint8_t ex, void (Push2::*press)()) @@ -236,6 +238,7 @@ class Push2 : public ARDOUR::ControlProtocol , id (bb) , press_method (press) , release_method (&Push2::relax) + , long_press_method (&Push2::relax) {} Button (ButtonID bb, uint8_t ex, void (Push2::*press)(), void (Push2::*release)()) @@ -243,6 +246,15 @@ class Push2 : public ARDOUR::ControlProtocol , id (bb) , press_method (press) , release_method (release) + , long_press_method (&Push2::relax) + {} + + Button (ButtonID bb, uint8_t ex, void (Push2::*press)(), void (Push2::*release)(), void (Push2::*long_press)()) + : LED (ex) + , id (bb) + , press_method (press) + , release_method (release) + , long_press_method (long_press) {} MidiByteArray state_msg () const { return MidiByteArray (3, 0xb0|_state, _extra, _color_index); } @@ -251,6 +263,8 @@ class Push2 : public ARDOUR::ControlProtocol ButtonID id; void (Push2::*press_method)(); void (Push2::*release_method)(); + void (Push2::*long_press_method)(); + sigc::connection timeout_connection; }; struct ColorButton : public Button { @@ -263,6 +277,9 @@ class Push2 : public ARDOUR::ControlProtocol ColorButton (ButtonID bb, uint8_t ex, void (Push2::*press)(), void (Push2::*release)()) : Button (bb, ex, press, release) {} + + ColorButton (ButtonID bb, uint8_t ex, void (Push2::*press)(), void (Push2::*release)(), void (Push2::*long_press)()) + : Button (bb, ex, press, release, long_press) {} }; struct WhiteButton : public Button { @@ -274,6 +291,9 @@ class Push2 : public ARDOUR::ControlProtocol WhiteButton (ButtonID bb, uint8_t ex, void (Push2::*press)(), void (Push2::*release)()) : Button (bb, ex, press, release) {} + + WhiteButton (ButtonID bb, uint8_t ex, void (Push2::*press)(), void (Push2::*release)(), void (Push2::*long_press)()) + : Button (bb, ex, press, release, long_press) {} }; void relax () {} @@ -284,6 +304,11 @@ class Push2 : public ARDOUR::ControlProtocol /* map of Buttons by ButtonID */ typedef std::map IDButtonMap; IDButtonMap id_button_map; + std::set buttons_down; + std::set consumed; + + bool button_long_press_timeout (ButtonID id); + void start_press_timeout (Button&, ButtonID); void init_buttons (bool startup); void init_touch_strip (); @@ -345,8 +370,6 @@ class Push2 : public ARDOUR::ControlProtocol void button_solo (); void button_fixed_length (); void button_new (); - void button_shift_press (); - void button_shift_release (); void button_browse (); void button_clip (); void button_upper (uint32_t n); @@ -376,6 +399,19 @@ class Push2 : public ARDOUR::ControlProtocol void button_fwd8 (); void button_fwd4t (); void button_fwd4 (); + void button_add_track (); + void button_stop (); + void button_shift_press (); + void button_shift_release (); + void button_shift_long_press (); + void button_select_press (); + void button_select_release (); + void button_select_long_press (); + + void start_shift (); + void end_shift (); + void start_select (); + void end_select (); /* encoders */ @@ -403,6 +439,7 @@ class Push2 : public ARDOUR::ControlProtocol void solo_change (int); void mute_change (int); + void stripable_property_change (PBD::PropertyChange const& what_changed, int which); void switch_bank (uint32_t base); }; -- 2.30.2