put all of the Mackie control surface code into the ArdourSurface namespace

This commit is contained in:
Paul Davis 2015-04-15 20:37:20 -04:00
parent 12cb11b286
commit 4512d013eb
37 changed files with 131 additions and 53 deletions

View file

@ -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;
}