ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

push2: launch clips with pads

Browse Source
This commit is contained in:
Paul Davis 2022-08-27 08:15:40 -06:00
parent 26c48aae1b
commit 8ed8895439
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/surfaces/push2/cues.cc
View File

@ -47,6 +47,7 @@
#include "ardour/solo_isolate_control.h"
#include "ardour/solo_safe_control.h"
#include "ardour/tempo.h"
#include "ardour/triggerbox.h"
#include "gtkmm2ext/gui_thread.h"
#include "gtkmm2ext/rgb_macros.h"
@ -288,3 +289,9 @@ CueLayout::button_stop_press ()
_p2.get_session().stop_all_triggers (false); /* quantized global stop */
}
}
void
CueLayout::pad_press (int x, int y)
{
_p2.bang (x + track_base, y + scene_base);
}

2
libs/surfaces/push2/cues.h
View File

@ -67,6 +67,8 @@ class CueLayout : public Push2Layout
void strip_vpot (int, int);
void strip_vpot_touch (int, bool);
void pad_press (int x, int y);
private:
ArdourCanvas::Rectangle* _bg;
ArdourCanvas::Line* _upper_line;

3
libs/surfaces/push2/layout.h
View File

@ -68,6 +68,9 @@ class Push2Layout : public sigc::trackable, public ArdourCanvas::Container
virtual void strip_vpot (int, int) = 0;
virtual void strip_vpot_touch (int, bool) = 0;
virtual void pad_press (int x, int y) {}
virtual void pad_release (int x, int y) {}
virtual void update_meters () {}
virtual void update_clocks () {}

17
libs/surfaces/push2/push2.cc
View File

@ -441,6 +441,10 @@ Push2::init_buttons (bool startup)
}
if (!startup) {
if (_current_layout) {
_current_layout->hide ();
}
for (NNPadMap::iterator pi = _nn_pad_map.begin(); pi != _nn_pad_map.end(); ++pi) {
boost::shared_ptr<Pad> pad = pi->second;
@ -806,6 +810,11 @@ Push2::handle_midi_note_on_message (MIDI::Parser& parser, MIDI::EventTwoBytes* e
boost::shared_ptr<const Pad> pad_pressed = pm->second;
if (_current_layout == _cue_layout) {
_current_layout->pad_press (pad_pressed->x, pad_pressed->y);
return;
}
pair<FNPadMap::iterator,FNPadMap::iterator> pads_with_note = _fn_pad_map.equal_range (pad_pressed->filtered);
if (pads_with_note.first == _fn_pad_map.end()) {
@ -844,6 +853,10 @@ Push2::handle_midi_note_off_message (MIDI::Parser&, MIDI::EventTwoBytes* ev)
boost::shared_ptr<const Pad> const pad_pressed = pm->second;
if (_current_layout == _cue_layout) {
_current_layout->pad_release (pad_pressed->x, pad_pressed->y);
return;
}
pair<FNPadMap::iterator,FNPadMap::iterator> pads_with_note = _fn_pad_map.equal_range (pad_pressed->filtered);
if (pads_with_note.first == _fn_pad_map.end()) {
@ -1142,6 +1155,10 @@ Push2::pad_filter (MidiBuffer& in, MidiBuffer& out) const
context. It must use atomics to check state, and must not block.
*/
if (_current_layout == _cue_layout) {
return false;
}
bool matched = false;
for (MidiBuffer::iterator ev = in.begin(); ev != in.end(); ++ev) {