push2: remove unneeded maps from Push2 object
This commit is contained in:
parent
c4602603b4
commit
64d390ff13
|
@ -39,8 +39,7 @@ Push2::build_maps ()
|
|||
|
||||
#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));
|
||||
nn_pad_map.insert (std::make_pair (pad->extra(), pad));
|
||||
|
||||
MAKE_PAD (0, 0, 92);
|
||||
MAKE_PAD (0, 1, 93);
|
||||
|
|
|
@ -133,7 +133,6 @@ Push2::Push2 (ARDOUR::Session& s)
|
|||
{
|
||||
context = Cairo::Context::create (frame_buffer);
|
||||
|
||||
build_pad_table ();
|
||||
build_maps ();
|
||||
|
||||
/* master cannot be removed, so no need to connect to going-away signal */
|
||||
|
@ -1340,16 +1339,6 @@ Push2::input_port()
|
|||
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
|
||||
Push2::pad_note (int row, int col) const
|
||||
{
|
||||
|
|
|
@ -371,14 +371,6 @@ class Push2 : public ARDOUR::ControlProtocol
|
|||
/* map of Pads by note number */
|
||||
typedef std::map<int,Pad*> NNPadMap;
|
||||
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_state (ButtonID, LED::State);
|
||||
|
@ -529,9 +521,6 @@ class Push2 : public ARDOUR::ControlProtocol
|
|||
PBD::ScopedConnection selection_connection;
|
||||
void stripable_selection_change (ARDOUR::StripableNotificationListPtr);
|
||||
|
||||
std::map<int,int> pad_map;
|
||||
void build_pad_table();
|
||||
|
||||
MusicalMode::Type _mode;
|
||||
int _scale_root;
|
||||
int _root_octave;
|
||||
|
|
Loading…
Reference in New Issue
Block a user