change API of MIDI::Port::drain() to include a maximum blocking time

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

diff --git a/libs/surfaces/mackie/types.cc b/libs/surfaces/mackie/types.cc
index b9f2e9d488c0556744fad5f92bfff2f02d9d3dc6..9ee0431cd9817f1f64d65d2e79b21677f1b44a39 100644 (file)
--- a/libs/surfaces/mackie/types.cc
+++ b/libs/surfaces/mackie/types.cc
@@ -1,13 +1,37 @@
+/*
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #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;
@@ -25,5 +49,3 @@ std::ostream & operator << ( std::ostream & os, const ControlState & cs )
 
        return os;
 }
-
-}