diff options
Diffstat (limited to 'libs/surfaces/mackie/controls.cc')
| -rw-r--r-- | libs/surfaces/mackie/controls.cc | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/libs/surfaces/mackie/controls.cc b/libs/surfaces/mackie/controls.cc index 9858f5fd16..1c88c2b74c 100644 --- a/libs/surfaces/mackie/controls.cc +++ b/libs/surfaces/mackie/controls.cc @@ -34,8 +34,10 @@ #include "meter.h" -using namespace Mackie; using namespace std; +using namespace ArdourSurface; +using namespace Mackie; + using ARDOUR::AutomationControl; void Group::add (Control& control) @@ -69,20 +71,6 @@ Control::set_in_use (bool in_use) _in_use = in_use; } -ostream & Mackie::operator << (ostream & os, const Mackie::Control & control) -{ - os << typeid (control).name(); - os << " { "; - os << "name: " << control.name(); - os << ", "; - os << "id: " << "0x" << setw(2) << setfill('0') << hex << control.id() << setfill(' '); - os << ", "; - os << "group: " << control.group().name(); - os << " }"; - - return os; -} - void Control::set_control (boost::shared_ptr<AutomationControl> ac) { @@ -122,3 +110,17 @@ Control::stop_touch (bool mark, double when) } } +ostream & operator << (ostream & os, const ArdourSurface::Mackie::Control & control) +{ + os << typeid (control).name(); + os << " { "; + os << "name: " << control.name(); + os << ", "; + os << "id: " << "0x" << setw(2) << setfill('0') << hex << control.id() << setfill(' '); + os << ", "; + os << "group: " << control.group().name(); + os << " }"; + + return os; +} + |