X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FDVB%2FDVBSocketController.cc;h=f9078da4dc58529f8b139512caf2fad021b01b82;hb=8a6697d11e9a6557d9a5c42b4052666fce32bc10;hp=2d9181a8f1aa867ced47fc5fd0da31cb63260965;hpb=61b2e2ea5cb50df90931acf3fcd840493ba762a9;p=senf.git

diff --git a/senf/Socket/Protocols/DVB/DVBSocketController.cc b/senf/Socket/Protocols/DVB/DVBSocketController.cc
index 2d9181a..f9078da 100644
--- a/senf/Socket/Protocols/DVB/DVBSocketController.cc
+++ b/senf/Socket/Protocols/DVB/DVBSocketController.cc
@@ -2,26 +2,30 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Anton Gillert <atx@berlios.de>
 //
-// 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.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// 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.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// 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.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Anton Gillert <atx@berlios.de>
 /** \file
-    \brief DVBSocketControlle-r non-inline non-template implementation */
+    \brief DVBSocketController non-inline non-template implementation */
 
 #include "DVBSocketController.hh"
 
@@ -35,7 +39,7 @@
 #include "DVBProtocolWrapper.hh"
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 unsigned int senf::DVBSocketController::controllerNr(0);
 
@@ -457,8 +461,8 @@ prefix_ void senf::DVBSocketController::readEvent(int event)
 
 prefix_ void senf::DVBSocketController::initConsole()
 {
-    namespace fty = senf::console::factory;
-    namespace kw = senf::console::kw;
+    namespace fty = console::factory;
+    namespace kw = console::kw;
 
     dir.doc("DVB Controller " + controllerNr);
     ++controllerNr;
@@ -484,7 +488,7 @@ prefix_ void senf::DVBSocketController::initConsole()
             .arg("mode", "mode 'sync' or 'async'", kw::default_value = "async") );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_