summaryrefslogtreecommitdiff
path: root/libs/surfaces/push2/push2.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-07-07 15:53:19 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-09-27 14:59:30 -0500
commit70477e6fedee80a4e785d4da65c873329d06f76a (patch)
treeaa35d35bcf352a96b8b9c421f817c16d8483d8e0 /libs/surfaces/push2/push2.h
parent2aec2161f9a0124fc5ad5a7843e03a1507a24627 (diff)
push2: almost fully operational ableton style pad mapping, etc
Diffstat (limited to 'libs/surfaces/push2/push2.h')
-rw-r--r--libs/surfaces/push2/push2.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/surfaces/push2/push2.h b/libs/surfaces/push2/push2.h
index 806d5d0ad1..e39c07e76c 100644
--- a/libs/surfaces/push2/push2.h
+++ b/libs/surfaces/push2/push2.h
@@ -95,10 +95,10 @@ class Push2 : public ARDOUR::ControlProtocol
boost::shared_ptr<ARDOUR::Port> input_port();
boost::shared_ptr<ARDOUR::Port> output_port();
- uint8_t pad_note (int row, int col) const;
+ int pad_note (int row, int col) const;
PBD::Signal0<void> PadChange;
- void set_pad_scale (int root, int octave, MusicalMode::Type mode);
+ void set_pad_scale (int root, int octave, MusicalMode::Type mode, bool inkey);
private:
libusb_device_handle *handle;
@@ -513,6 +513,12 @@ class Push2 : public ARDOUR::ControlProtocol
std::map<int,int> pad_map;
void build_pad_table();
+
+ MusicalMode::Type mode;
+ int scale_root;
+ int root_octave;
+ bool in_key;
+
int octave_shift;
};