diff options
Diffstat (limited to 'libs/surfaces/push2/push2.h')
| -rw-r--r-- | libs/surfaces/push2/push2.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/surfaces/push2/push2.h b/libs/surfaces/push2/push2.h index 7c9d147e7d..89982928bd 100644 --- a/libs/surfaces/push2/push2.h +++ b/libs/surfaces/push2/push2.h @@ -352,7 +352,7 @@ class Push2 : public ARDOUR::ControlProtocol ModifierState modifier_state() const { return _modifier_state; } - Button* button_by_id (ButtonID); + boost::shared_ptr<Button> button_by_id (ButtonID); static std::string button_name_by_id (ButtonID); void strip_buttons_off (); @@ -387,16 +387,16 @@ class Push2 : public ARDOUR::ControlProtocol void relax () {} /* map of Buttons by CC */ - typedef std::map<int,Button*> CCButtonMap; + typedef std::map<int,boost::shared_ptr<Button> > CCButtonMap; CCButtonMap cc_button_map; /* map of Buttons by ButtonID */ - typedef std::map<ButtonID,Button*> IDButtonMap; + typedef std::map<ButtonID,boost::shared_ptr<Button> > IDButtonMap; IDButtonMap id_button_map; std::set<ButtonID> buttons_down; std::set<ButtonID> consumed; bool button_long_press_timeout (ButtonID id); - void start_press_timeout (Button&, ButtonID); + void start_press_timeout (boost::shared_ptr<Button>, ButtonID); void init_buttons (bool startup); void init_touch_strip (); @@ -404,12 +404,12 @@ class Push2 : public ARDOUR::ControlProtocol /* map of Pads by note number (the "fixed" note number sent by the * hardware, not the note number generated if the pad is touched) */ - typedef std::map<int,Pad*> NNPadMap; + typedef std::map<int,boost::shared_ptr<Pad> > NNPadMap; NNPadMap nn_pad_map; /* map of Pads by note number they generate (their "filtered" value) */ - typedef std::multimap<int,Pad*> FNPadMap; + typedef std::multimap<int,boost::shared_ptr<Pad> > FNPadMap; FNPadMap fn_pad_map; void set_button_color (ButtonID, uint8_t color_index); |