fix crash when switching from regular MIDI to ipMIDI Mackie surface

[ardour.git] / libs / surfaces / mackie / types.cc

diff --git a/libs/surfaces/mackie/types.cc b/libs/surfaces/mackie/types.cc
index 4edb211553e4951953e0ed10e1900a88ee4e6e4f..9ee0431cd9817f1f64d65d2e79b21677f1b44a39 100644 (file)
--- 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;
 }
-
-}