diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-25 04:42:01 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-04-25 04:42:01 +0000 |
commit | b31400207efae605c135ce9d7e2af31305f04da6 (patch) | |
tree | ee41d78393a63fa1cb6b7c48e542c290ca5a44b9 /libs/surfaces/mackie/surface.cc | |
parent | bc34fd18c26df1f4ab37316acc9c90bcb58f767c (diff) |
MCP: various fixes, plus removal of ui_bind() (just for mackie code)
git-svn-id: svn://localhost/ardour2/branches/3.0@12086 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/mackie/surface.cc')
-rw-r--r-- | libs/surfaces/mackie/surface.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc index e2c364b523..7c604138c3 100644 --- a/libs/surfaces/mackie/surface.cc +++ b/libs/surfaces/mackie/surface.cc @@ -42,7 +42,6 @@ using ARDOUR::Pannable; using ARDOUR::AutomationControl; #define ui_context() MackieControlProtocol::instance() /* a UICallback-derived object that specifies the event loop for signal handling */ -#define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__)) // The MCU sysex header.4th byte Will be overwritten // when we get an incoming sysex that identifies @@ -205,7 +204,7 @@ Surface::setup_master () } _master_fader->set_control (m->gain_control()); - m->gain_control()->Changed.connect (*this, MISSING_INVALIDATOR, ui_bind (&Surface::master_gain_changed, this), ui_context()); + m->gain_control()->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&Surface::master_gain_changed, this), ui_context()); } void |