From 4512d013eb7c658519abc8b5e82a1e7bf926cad6 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 15 Apr 2015 20:37:20 -0400
Subject: put all of the Mackie control surface code into the ArdourSurface
 namespace

---
 libs/surfaces/mackie/button.cc                  |  1 +
 libs/surfaces/mackie/button.h                   |  5 +++-
 libs/surfaces/mackie/control_group.h            |  2 ++
 libs/surfaces/mackie/controls.cc                | 32 +++++++++++++------------
 libs/surfaces/mackie/controls.h                 | 15 ++++++------
 libs/surfaces/mackie/device_info.cc             |  4 +++-
 libs/surfaces/mackie/device_info.h              |  7 ++++--
 libs/surfaces/mackie/device_profile.cc          |  4 +++-
 libs/surfaces/mackie/device_profile.h           |  3 +++
 libs/surfaces/mackie/fader.cc                   |  1 +
 libs/surfaces/mackie/fader.h                    |  3 +++
 libs/surfaces/mackie/gui.cc                     |  3 ++-
 libs/surfaces/mackie/gui.h                      |  9 ++++---
 libs/surfaces/mackie/interface.cc               |  2 ++
 libs/surfaces/mackie/jog.cc                     |  1 +
 libs/surfaces/mackie/jog.h                      |  2 ++
 libs/surfaces/mackie/jog_wheel.cc               |  1 +
 libs/surfaces/mackie/jog_wheel.h                |  3 +++
 libs/surfaces/mackie/led.cc                     |  1 +
 libs/surfaces/mackie/led.h                      |  3 +++
 libs/surfaces/mackie/mackie_control_exception.h |  5 ++--
 libs/surfaces/mackie/mackie_control_protocol.cc |  7 +++---
 libs/surfaces/mackie/mackie_control_protocol.h  |  8 ++++++-
 libs/surfaces/mackie/mcp_buttons.cc             |  5 ++--
 libs/surfaces/mackie/meter.cc                   |  3 ++-
 libs/surfaces/mackie/meter.h                    |  5 +++-
 libs/surfaces/mackie/pot.cc                     |  1 +
 libs/surfaces/mackie/pot.h                      |  3 +++
 libs/surfaces/mackie/strip.cc                   |  3 ++-
 libs/surfaces/mackie/strip.h                    |  3 +++
 libs/surfaces/mackie/surface.cc                 |  3 ++-
 libs/surfaces/mackie/surface.h                  |  4 ++++
 libs/surfaces/mackie/surface_port.cc            |  3 ++-
 libs/surfaces/mackie/surface_port.h             |  6 ++++-
 libs/surfaces/mackie/timer.h                    |  5 +++-
 libs/surfaces/mackie/types.cc                   | 13 ++++++----
 libs/surfaces/mackie/types.h                    |  5 ++--
 37 files changed, 131 insertions(+), 53 deletions(-)

diff --git a/libs/surfaces/mackie/button.cc b/libs/surfaces/mackie/button.cc
index 8f13c4029c..c4f68ebda2 100644
--- a/libs/surfaces/mackie/button.cc
+++ b/libs/surfaces/mackie/button.cc
@@ -23,6 +23,7 @@
 #include "surface.h"
 #include "control_group.h"
 
+using namespace ArdourSurface;
 using namespace Mackie;
 
 Control*
diff --git a/libs/surfaces/mackie/button.h b/libs/surfaces/mackie/button.h
index c5d227d7c8..e836ff9c18 100644
--- a/libs/surfaces/mackie/button.h
+++ b/libs/surfaces/mackie/button.h
@@ -23,6 +23,8 @@
 #include "controls.h"
 #include "led.h"
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 class Surface;
@@ -162,6 +164,7 @@ private:
 	Led _led;
 };
 
-}
+} // Mackie namespace
+} // ArdourSurface namespace
 
 #endif
diff --git a/libs/surfaces/mackie/control_group.h b/libs/surfaces/mackie/control_group.h
index 1b73770fa2..4955098225 100644
--- a/libs/surfaces/mackie/control_group.h
+++ b/libs/surfaces/mackie/control_group.h
@@ -3,6 +3,7 @@
 
 #include <vector>
 
+namespace ArdourSurface {
 namespace Mackie {
 
 class Control;
@@ -37,6 +38,7 @@ private:
 	std::string _name;
 };
 
+}
 }
 
 #endif
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;
+}
+
diff --git a/libs/surfaces/mackie/controls.h b/libs/surfaces/mackie/controls.h
index 0923c9772f..e8098ccf7e 100644
--- a/libs/surfaces/mackie/controls.h
+++ b/libs/surfaces/mackie/controls.h
@@ -36,15 +36,15 @@ namespace ARDOUR {
 	class AutomationControl;
 }
 
-namespace Mackie
-{
+namespace ArdourSurface {
+
+namespace Mackie {
 
 class Strip;
 class Group;
 class Surface;
 
-class Control
-{
+class Control {
 public:
 	Control (int id, std::string name, Group& group);
 	virtual ~Control() {}
@@ -56,7 +56,7 @@ public:
 	bool in_use () const;
 	void set_in_use (bool);
 	
-	/// Keep track of the timeout so it can be updated with more incoming events
+	// Keep track of the timeout so it can be updated with more incoming events
 	sigc::connection in_use_connection;
 
 	virtual MidiByteArray zero() = 0;
@@ -85,8 +85,9 @@ public:
 	bool _in_use;
 };
 
-std::ostream & operator <<  (std::ostream & os, const Control & control);
-
 }
+}
+
+std::ostream & operator <<  (std::ostream & os, const ArdourSurface::Mackie::Control & control);
 
 #endif /* __mackie_controls_h__ */
diff --git a/libs/surfaces/mackie/device_info.cc b/libs/surfaces/mackie/device_info.cc
index 2a953fd44c..3ec1369eea 100644
--- a/libs/surfaces/mackie/device_info.cc
+++ b/libs/surfaces/mackie/device_info.cc
@@ -33,9 +33,11 @@
 
 #include "i18n.h"
 
-using namespace Mackie;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ArdourSurface;
+using namespace Mackie;
+
 using std::string;
 using std::vector;
 
diff --git a/libs/surfaces/mackie/device_info.h b/libs/surfaces/mackie/device_info.h
index 33f554fe07..9a70852ed6 100644
--- a/libs/surfaces/mackie/device_info.h
+++ b/libs/surfaces/mackie/device_info.h
@@ -29,6 +29,8 @@
 
 class XMLNode;
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 struct GlobalButtonInfo {
@@ -108,8 +110,9 @@ class DeviceInfo
 };
 
 
-}
+} // Mackie namespace
+} // ArdourSurface namespace
 
-std::ostream& operator<< (std::ostream& os, const Mackie::DeviceInfo& di);
+std::ostream& operator<< (std::ostream& os, const ArdourSurface::Mackie::DeviceInfo& di);
 
 #endif /* __ardour_mackie_control_protocol_device_info_h__ */
diff --git a/libs/surfaces/mackie/device_profile.cc b/libs/surfaces/mackie/device_profile.cc
index 320dd49297..d71d6d9888 100644
--- a/libs/surfaces/mackie/device_profile.cc
+++ b/libs/surfaces/mackie/device_profile.cc
@@ -35,9 +35,11 @@
 
 #include "i18n.h"
 
-using namespace Mackie;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ArdourSurface;
+using namespace Mackie;
+
 using std::string;
 using std::vector;
 
diff --git a/libs/surfaces/mackie/device_profile.h b/libs/surfaces/mackie/device_profile.h
index 65aba48692..15702a6886 100644
--- a/libs/surfaces/mackie/device_profile.h
+++ b/libs/surfaces/mackie/device_profile.h
@@ -28,6 +28,8 @@
 
 class XMLNode;
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 class DeviceProfile
@@ -67,6 +69,7 @@ class DeviceProfile
 	void save ();
 };
 
+}
 }
 
 #endif /* __ardour_mackie_control_protocol_device_profile_h__ */
diff --git a/libs/surfaces/mackie/fader.cc b/libs/surfaces/mackie/fader.cc
index 4b9da7226a..cc43bf3387 100644
--- a/libs/surfaces/mackie/fader.cc
+++ b/libs/surfaces/mackie/fader.cc
@@ -24,6 +24,7 @@
 #include "control_group.h"
 #include "mackie_control_protocol.h"
 
+using namespace ArdourSurface;
 using namespace Mackie;
 
 Control*
diff --git a/libs/surfaces/mackie/fader.h b/libs/surfaces/mackie/fader.h
index 42a485036e..8de8a5896c 100644
--- a/libs/surfaces/mackie/fader.h
+++ b/libs/surfaces/mackie/fader.h
@@ -3,6 +3,8 @@
 
 #include "controls.h"
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 class Fader : public Control
@@ -26,6 +28,7 @@ class Fader : public Control
 	float position;
 };
 
+}
 }
 
 #endif
diff --git a/libs/surfaces/mackie/gui.cc b/libs/surfaces/mackie/gui.cc
index 6753f0a97c..105bac060c 100644
--- a/libs/surfaces/mackie/gui.cc
+++ b/libs/surfaces/mackie/gui.cc
@@ -42,8 +42,9 @@
 #include "i18n.h"
 
 using namespace std;
-using namespace Mackie;
 using namespace Gtk;
+using namespace ArdourSurface;
+using namespace Mackie;
 
 void*
 MackieControlProtocol::get_gui () const
diff --git a/libs/surfaces/mackie/gui.h b/libs/surfaces/mackie/gui.h
index 42ee338f99..6fc0352b65 100644
--- a/libs/surfaces/mackie/gui.h
+++ b/libs/surfaces/mackie/gui.h
@@ -16,7 +16,6 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/box.h>
 #include <gtkmm/spinbutton.h>
@@ -30,12 +29,14 @@ namespace Gtk {
 	class CellRendererCombo;
 }
 
-class MackieControlProtocol;
-
 #include "button.h"
 
 #include "i18n.h"
 
+namespace ArdourSurface {
+
+class MackieControlProtocol;
+
 class MackieControlProtocolGUI : public Gtk::Notebook
 {
   public:
@@ -110,3 +111,5 @@ class MackieControlProtocolGUI : public Gtk::Notebook
     void discover_clicked ();
 };
 
+}
+
diff --git a/libs/surfaces/mackie/interface.cc b/libs/surfaces/mackie/interface.cc
index abef84817d..bb0a4d0509 100644
--- a/libs/surfaces/mackie/interface.cc
+++ b/libs/surfaces/mackie/interface.cc
@@ -28,6 +28,8 @@
 using namespace ARDOUR;
 using namespace PBD;
 using namespace std;
+using namespace ArdourSurface;
+using namespace Mackie;
 
 static ControlProtocol*
 new_mackie_protocol (ControlProtocolDescriptor*, Session* s)
diff --git a/libs/surfaces/mackie/jog.cc b/libs/surfaces/mackie/jog.cc
index dc832868ed..c36b975110 100644
--- a/libs/surfaces/mackie/jog.cc
+++ b/libs/surfaces/mackie/jog.cc
@@ -21,6 +21,7 @@
 #include "surface.h"
 #include "control_group.h"
 
+using namespace ArdourSurface;
 using namespace Mackie;
 
 const int Jog::ID = 0x3c;
diff --git a/libs/surfaces/mackie/jog.h b/libs/surfaces/mackie/jog.h
index 23451f92b2..ac1bc9e52a 100644
--- a/libs/surfaces/mackie/jog.h
+++ b/libs/surfaces/mackie/jog.h
@@ -23,6 +23,7 @@
 #include "controls.h"
 #include "pot.h"
 
+namespace ArdourSurface {
 namespace Mackie {
 
 class Jog : public Pot
@@ -40,6 +41,7 @@ public:
 	static Control* factory (Surface&, int id, const char*, Group&);
 };
 
+}
 }
 
 #endif /* __ardour_mackie_control_protocol_jog_h__ */
diff --git a/libs/surfaces/mackie/jog_wheel.cc b/libs/surfaces/mackie/jog_wheel.cc
index f42826ac0b..318a6452a0 100644
--- a/libs/surfaces/mackie/jog_wheel.cc
+++ b/libs/surfaces/mackie/jog_wheel.cc
@@ -29,6 +29,7 @@
 
 #include <algorithm>
 
+using namespace ArdourSurface;
 using namespace Mackie;
 
 JogWheel::JogWheel (MackieControlProtocol & mcp)
diff --git a/libs/surfaces/mackie/jog_wheel.h b/libs/surfaces/mackie/jog_wheel.h
index 0750775bdd..5ef3c6c255 100644
--- a/libs/surfaces/mackie/jog_wheel.h
+++ b/libs/surfaces/mackie/jog_wheel.h
@@ -7,6 +7,8 @@
 #include <deque>
 #include <queue>
 
+namespace ArdourSurface { 
+
 class MackieControlProtocol;
 
 namespace Mackie
@@ -29,6 +31,7 @@ private:
 	Mode _mode;
 };
 
+}
 }
 
 #endif
diff --git a/libs/surfaces/mackie/led.cc b/libs/surfaces/mackie/led.cc
index 38aa5c7f3b..6a090cdc74 100644
--- a/libs/surfaces/mackie/led.cc
+++ b/libs/surfaces/mackie/led.cc
@@ -21,6 +21,7 @@
 #include "surface.h"
 #include "control_group.h"
 
+using namespace ArdourSurface;
 using namespace Mackie;
 
 const int Led::FaderTouch = 0x70;
diff --git a/libs/surfaces/mackie/led.h b/libs/surfaces/mackie/led.h
index fdbeb8cd9c..8361c4bb8d 100644
--- a/libs/surfaces/mackie/led.h
+++ b/libs/surfaces/mackie/led.h
@@ -24,6 +24,8 @@
 #include "midi_byte_array.h"
 #include "types.h"
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 class Led : public Control
@@ -52,6 +54,7 @@ public:
 	LedState state;
 };
 
+}
 }
 
 #endif /* __ardour_mackie_control_protocol_led_h__ */
diff --git a/libs/surfaces/mackie/mackie_control_exception.h b/libs/surfaces/mackie/mackie_control_exception.h
index afe7016948..b40c5c3915 100644
--- a/libs/surfaces/mackie/mackie_control_exception.h
+++ b/libs/surfaces/mackie/mackie_control_exception.h
@@ -20,8 +20,8 @@
 
 #include <stdexcept>
 
-namespace Mackie
-{
+namespace ArdourSurface {
+namespace Mackie {
 
 class MackieControlException : public std::exception
 {
@@ -42,6 +42,7 @@ private:
 	std::string _msg;
 };
 
+}
 }
 
 #endif
diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 5d2eadc572..76122d1f19 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -71,9 +71,10 @@
 
 using namespace ARDOUR;
 using namespace std;
-using namespace Mackie;
 using namespace PBD;
 using namespace Glib;
+using namespace ArdourSurface;
+using namespace Mackie;
 
 #include "i18n.h"
 
@@ -657,9 +658,9 @@ MackieControlProtocol::set_device (const string& device_name)
 }
 
 gboolean 
-ipmidi_input_handler (GIOChannel*, GIOCondition condition, void *data)
+ArdourSurface::ipmidi_input_handler (GIOChannel*, GIOCondition condition, void *data)
 {
-        MackieControlProtocol::ipMIDIHandler* ipm = static_cast<MackieControlProtocol::ipMIDIHandler*>(data);
+	ArdourSurface::MackieControlProtocol::ipMIDIHandler* ipm = static_cast<ArdourSurface::MackieControlProtocol::ipMIDIHandler*>(data);
         return ipm->mcp->midi_input_handler (Glib::IOCondition (condition), ipm->port);
 }
 
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 1def854b8f..1e15d8db16 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -50,6 +50,8 @@ namespace MIDI {
 	class Port;
 }
 
+namespace ArdourSurface {
+
 namespace Mackie {
 	class Surface;
 	class Control;
@@ -57,6 +59,8 @@ namespace Mackie {
 	class Button;
 }
 
+gboolean ipmidi_input_handler (GIOChannel*, GIOCondition condition, void *data);
+
 /**
 	This handles the plugin duties, and the midi encoding and decoding,
 	and the signal callbacks, mostly from ARDOUR::Route.
@@ -297,7 +301,7 @@ class MackieControlProtocol
                 MIDI::Port* port;
         };
         friend struct ipMIDIHandler; /* is this necessary */
-        friend gboolean ipmidi_input_handler (GIOChannel*, GIOCondition condition, void *data);
+	friend gboolean ArdourSurface::ipmidi_input_handler (GIOChannel*, GIOCondition condition, void *data);
 
 	int create_surfaces ();
 	bool periodic();
@@ -509,4 +513,6 @@ class MackieControlProtocol
 	Mackie::LedState view_release (Mackie::Button&);
 };
 
+} // namespace 
+
 #endif // ardour_mackie_control_protocol_h
diff --git a/libs/surfaces/mackie/mcp_buttons.cc b/libs/surfaces/mackie/mcp_buttons.cc
index 792813bf33..a1ea089399 100644
--- a/libs/surfaces/mackie/mcp_buttons.cc
+++ b/libs/surfaces/mackie/mcp_buttons.cc
@@ -37,10 +37,11 @@
  * mackie_control_protocol.cc 
  */
 
-using namespace Mackie;
+using std::string;
 using namespace ARDOUR;
 using namespace PBD;
-using std::string;
+using namespace ArdourSurface;
+using namespace Mackie;
 
 LedState
 MackieControlProtocol::shift_press (Button &)
diff --git a/libs/surfaces/mackie/meter.cc b/libs/surfaces/mackie/meter.cc
index fe11357d3a..bc148db185 100644
--- a/libs/surfaces/mackie/meter.cc
+++ b/libs/surfaces/mackie/meter.cc
@@ -27,8 +27,9 @@
 #include "surface_port.h"
 #include "control_group.h"
 
-using namespace Mackie;
 using namespace PBD;
+using namespace ArdourSurface;
+using namespace Mackie;
 
 Control*
 Meter::factory (Surface& surface, int id, const char* name, Group& group)
diff --git a/libs/surfaces/mackie/meter.h b/libs/surfaces/mackie/meter.h
index db3e8cffb3..9ca5656664 100644
--- a/libs/surfaces/mackie/meter.h
+++ b/libs/surfaces/mackie/meter.h
@@ -23,6 +23,8 @@
 #include "controls.h"
 #include "midi_byte_array.h"
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 class SurfacePort;
@@ -46,6 +48,7 @@ public:
 	bool overload_on;
 };
 
-}
+} // Mackie namespace
+} // ArdourSurface namespace
 
 #endif /* __ardour_mackie_control_protocol_meter_h__ */
diff --git a/libs/surfaces/mackie/pot.cc b/libs/surfaces/mackie/pot.cc
index 8f0298ea72..e1ddae82f8 100644
--- a/libs/surfaces/mackie/pot.cc
+++ b/libs/surfaces/mackie/pot.cc
@@ -22,6 +22,7 @@
 #include "surface.h"
 #include "control_group.h"
 
+using namespace ArdourSurface;
 using namespace Mackie;
 
 int const Pot::External = 0x2e; /* specific ID for "vpot" representing external control */
diff --git a/libs/surfaces/mackie/pot.h b/libs/surfaces/mackie/pot.h
index 3bbf0f33f4..9511db0b71 100644
--- a/libs/surfaces/mackie/pot.h
+++ b/libs/surfaces/mackie/pot.h
@@ -22,6 +22,8 @@
 
 #include "controls.h"
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 class Pot : public Control
@@ -47,6 +49,7 @@ public:
 
 };
 
+}
 }
 
 #endif /* __ardour_mackie_control_protocol_pot_h__ */
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index 70a7cb90fd..23624d12cf 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -55,10 +55,11 @@
 #include "jog.h"
 #include "meter.h"
 
-using namespace Mackie;
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
+using namespace ArdourSurface;
+using namespace Mackie;
 
 #ifndef timeradd /// only avail with __USE_BSD
 #define timeradd(a,b,result)                         \
diff --git a/libs/surfaces/mackie/strip.h b/libs/surfaces/mackie/strip.h
index c330e0e54d..b4515def65 100644
--- a/libs/surfaces/mackie/strip.h
+++ b/libs/surfaces/mackie/strip.h
@@ -23,6 +23,8 @@ namespace ARDOUR {
 	class ChannelCount;
 }
 
+namespace ArdourSurface {
+
 namespace Mackie {
 
 class Control;
@@ -145,6 +147,7 @@ private:
 	std::map<Evoral::Parameter,Control*> control_by_parameter;
 };
 
+}
 }
 
 #endif /* __ardour_mackie_control_protocol_strip_h__ */
diff --git a/libs/surfaces/mackie/surface.cc b/libs/surfaces/mackie/surface.cc
index 09c5fff051..1fea8d7c3a 100644
--- a/libs/surfaces/mackie/surface.cc
+++ b/libs/surfaces/mackie/surface.cc
@@ -53,11 +53,12 @@
 
 using namespace std;
 using namespace PBD;
-using namespace Mackie;
 using ARDOUR::Route;
 using ARDOUR::Panner;
 using ARDOUR::Pannable;
 using ARDOUR::AutomationControl;
+using namespace ArdourSurface;
+using namespace Mackie;
 
 #define ui_context() MackieControlProtocol::instance() /* a UICallback-derived object that specifies the event loop for signal handling */
 
diff --git a/libs/surfaces/mackie/surface.h b/libs/surfaces/mackie/surface.h
index 1ed83aef1d..eab58e6a9f 100644
--- a/libs/surfaces/mackie/surface.h
+++ b/libs/surfaces/mackie/surface.h
@@ -21,6 +21,9 @@ namespace ARDOUR {
 }
 
 class MidiByteArray;
+
+namespace ArdourSurface {
+
 class MackieControlProtocol;
 
 namespace Mackie
@@ -174,6 +177,7 @@ public:
 	void master_gain_changed ();
 };
 
+}
 }
 
 #endif
diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc
index 013a0019c7..c732c6869c 100644
--- a/libs/surfaces/mackie/surface_port.cc
+++ b/libs/surfaces/mackie/surface_port.cc
@@ -44,9 +44,10 @@
 #include "i18n.h"
 
 using namespace std;
-using namespace Mackie;
 using namespace PBD;
 using namespace ARDOUR;
+using namespace ArdourSurface;
+using namespace Mackie;
 
 SurfacePort::SurfacePort (Surface& s)
 	: _surface (&s)
diff --git a/libs/surfaces/mackie/surface_port.h b/libs/surfaces/mackie/surface_port.h
index b361294fa9..1239bc533c 100644
--- a/libs/surfaces/mackie/surface_port.h
+++ b/libs/surfaces/mackie/surface_port.h
@@ -31,13 +31,16 @@ namespace MIDI {
 	class Port;
 }
 
-class MackieControlProtocol;
 
 namespace ARDOUR {
 	class AsyncMIDIPort;
 	class Port;
 }
 
+namespace ArdourSurface {
+
+class MackieControlProtocol;
+
 namespace Mackie
 {
 
@@ -74,6 +77,7 @@ private:
 
 std::ostream& operator <<  (std::ostream& , const SurfacePort& port);
 
+}
 }
 
 #endif
diff --git a/libs/surfaces/mackie/timer.h b/libs/surfaces/mackie/timer.h
index 0e19062911..dd6066c87b 100644
--- a/libs/surfaces/mackie/timer.h
+++ b/libs/surfaces/mackie/timer.h
@@ -25,6 +25,8 @@
 #include <sys/time.h>
 #endif
 
+namespace ArdourSurface {
+
 namespace Mackie
 {
 
@@ -96,6 +98,7 @@ private:
 	bool running;
 };
 
-}
+} // Mackie namespace
+} // ArdourSurface namespace
 
 #endif
diff --git a/libs/surfaces/mackie/types.cc b/libs/surfaces/mackie/types.cc
index 4edb211553..f3a05e0f3c 100644
--- a/libs/surfaces/mackie/types.cc
+++ b/libs/surfaces/mackie/types.cc
@@ -19,14 +19,19 @@
 
 #include "types.h"
 
-namespace Mackie
-{
+namespace ArdourSurface {
+
+namespace Mackie {
+
 LedState on( LedState::on );
 LedState off( LedState::off );
 LedState flashing( LedState::flashing );
 LedState none( LedState::none );
 
-std::ostream & operator << ( std::ostream & os, const ControlState & cs )
+}
+}
+
+std::ostream & operator << ( std::ostream & os, const ArdourSurface::Mackie::ControlState & cs )
 {
 	os << "ControlState { ";
 	os << "pos: " << cs.pos;
@@ -44,5 +49,3 @@ std::ostream & operator << ( std::ostream & os, const ControlState & cs )
 
 	return os;
 }
-
-}
diff --git a/libs/surfaces/mackie/types.h b/libs/surfaces/mackie/types.h
index d906af6d32..3095248a1a 100644
--- a/libs/surfaces/mackie/types.h
+++ b/libs/surfaces/mackie/types.h
@@ -20,8 +20,8 @@
 
 #include <iostream>
 
-namespace Mackie
-{
+namespace ArdourSurface  {
+namespace Mackie {
 
 enum surface_type_t { 
 	mcu, 
@@ -107,6 +107,7 @@ class Group;
 class Pot;
 class Led;
 
+}
 }
 
 #endif
-- 
cgit v1.2.3