mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-06 05:35:47 +01:00
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
e4372df05b
commit
68e943265e
283 changed files with 8269 additions and 3942 deletions
|
|
@ -24,6 +24,7 @@
|
|||
#include <string>
|
||||
|
||||
#include <gtkmm2ext/popup.h>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
|
||||
namespace PBD {
|
||||
class Controllable;
|
||||
|
|
@ -32,7 +33,7 @@ namespace PBD {
|
|||
class BindingProxy : public sigc::trackable
|
||||
{
|
||||
public:
|
||||
BindingProxy (PBD::Controllable&);
|
||||
BindingProxy (boost::shared_ptr<PBD::Controllable>);
|
||||
virtual ~BindingProxy();
|
||||
|
||||
void set_bind_button_state (guint button, guint statemask);
|
||||
|
|
@ -40,11 +41,11 @@ class BindingProxy : public sigc::trackable
|
|||
|
||||
bool button_press_handler (GdkEventButton *);
|
||||
|
||||
PBD::Controllable* get_controllable() { return &controllable; }
|
||||
protected:
|
||||
boost::shared_ptr<PBD::Controllable> get_controllable() { return controllable; }
|
||||
|
||||
protected:
|
||||
Gtkmm2ext::PopUp* prompter;
|
||||
PBD::Controllable& controllable;
|
||||
boost::shared_ptr<PBD::Controllable> controllable;
|
||||
guint bind_button;
|
||||
guint bind_statemask;
|
||||
sigc::connection learning_connection;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue