ardour/livetrax
13
0
Fork 0
Code

push2: remove unneeded maps from Push2 object

Browse Source
This commit is contained in:
Paul Davis 2016-07-10 11:30:16 -04:00
parent c4602603b4
commit 64d390ff13
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/surfaces/push2/buttons.cc
View File

@ -39,8 +39,7 @@ Push2::build_maps ()
#define MAKE_PAD(x,y,nn) \ #define MAKE_PAD(x,y,nn) \
pad = new Pad ((x), (y), (nn)); \ pad = new Pad ((x), (y), (nn)); \
nn_pad_map.insert (std::make_pair (pad->extra(), pad)); \ nn_pad_map.insert (std::make_pair (pad->extra(), pad));
coord_pad_map.insert (std::make_pair (pad->coord(), pad));
MAKE_PAD (0, 0, 92); MAKE_PAD (0, 0, 92);
MAKE_PAD (0, 1, 93); MAKE_PAD (0, 1, 93);

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

@ -133,7 +133,6 @@ Push2::Push2 (ARDOUR::Session& s)
{ {
context = Cairo::Context::create (frame_buffer); context = Cairo::Context::create (frame_buffer);
build_pad_table ();
build_maps (); build_maps ();
/* master cannot be removed, so no need to connect to going-away signal */ /* master cannot be removed, so no need to connect to going-away signal */
@ -1340,16 +1339,6 @@ Push2::input_port()
return _async_in; return _async_in;
} }
void
Push2::build_pad_table ()
{
for (int n = 36; n < 100; ++n) {
pad_map[n] = n + (octave_shift*12);
}
PadChange (); /* emit signal */
}
int int
Push2::pad_note (int row, int col) const Push2::pad_note (int row, int col) const
{ {

11
libs/surfaces/push2/push2.h
View File

@ -371,14 +371,6 @@ class Push2 : public ARDOUR::ControlProtocol
/* map of Pads by note number */ /* map of Pads by note number */
typedef std::map<int,Pad*> NNPadMap; typedef std::map<int,Pad*> NNPadMap;
NNPadMap nn_pad_map; NNPadMap nn_pad_map;
/* map of Pads by coordinate
*
* coord = row * 64 + column;
*
* rows start at top left
*/
typedef std::map<int,Pad*> CoordPadMap;
CoordPadMap coord_pad_map;
void set_button_color (ButtonID, uint8_t color_index); void set_button_color (ButtonID, uint8_t color_index);
void set_button_state (ButtonID, LED::State); void set_button_state (ButtonID, LED::State);
@ -529,9 +521,6 @@ class Push2 : public ARDOUR::ControlProtocol
PBD::ScopedConnection selection_connection; PBD::ScopedConnection selection_connection;
void stripable_selection_change (ARDOUR::StripableNotificationListPtr); void stripable_selection_change (ARDOUR::StripableNotificationListPtr);
std::map<int,int> pad_map;
void build_pad_table();
MusicalMode::Type _mode; MusicalMode::Type _mode;
int _scale_root; int _scale_root;
int _root_octave; int _root_octave;