X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fmackie%2Ftypes.cc;h=9ee0431cd9817f1f64d65d2e79b21677f1b44a39;hb=0c448c387bf4fc11c1bc2494055303ed12a15208;hp=4edb211553e4951953e0ed10e1900a88ee4e6e4f;hpb=2eb43c83100010c1214925b3a306ef1a6657c184;p=ardour.git

diff --git a/libs/surfaces/mackie/types.cc b/libs/surfaces/mackie/types.cc
index 4edb211553..9ee0431cd9 100644
--- a/libs/surfaces/mackie/types.cc
+++ b/libs/surfaces/mackie/types.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    Copyright (C) 2012 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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;
 }
-
-}