X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FJack.hh;h=a49d9f89b11831d753a092a7cb54ee9c0cbac19f;hb=refs%2Fheads%2Fmaster;hp=9d5718677adc4b34f694aae74c4a48d6308360ed;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/PPI/Jack.hh b/senf/PPI/Jack.hh
index 9d57186..a49d9f8 100644
--- a/senf/PPI/Jack.hh
+++ b/senf/PPI/Jack.hh
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@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):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Jack public header */
@@ -33,7 +38,7 @@
 #include "Setup.hh"
 
 //#include "Jack.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 namespace ppi {
@@ -45,7 +50,7 @@ namespace connector {
         : private boost::noncopyable, private ppi::detail::DisableStandardConnect
     {};
 
-    /** \brief Jack referencing an ActiveInput 
+    /** \brief Jack referencing an ActiveInput
         \see \ref ppi_jacks */
     class GenericActiveInputJack
         : public Jack
@@ -95,7 +100,7 @@ namespace connector {
     private:
         GenericPassiveInput * input_;
     };
-    
+
     /** \brief Jack referencing a PassiveOutput
         \see \ref ppi_jacks */
     class GenericPassiveOutputJack
@@ -122,13 +127,13 @@ namespace connector {
     public:
         explicit ActiveInputJack(ActiveInput<PacketType> & input);
         explicit ActiveInputJack(ActiveInput<> & input);
-        
+
         explicit ActiveInputJack(ActiveInputJack & input);
         explicit ActiveInputJack(ActiveInputJack<> & input);
 
         void reset(ActiveInput<PacketType> & input);
         void reset(ActiveInput<> & input);
-        
+
         void reset(ActiveInputJack & input);
         void reset(ActiveInputJack<> & input);
     };
@@ -274,25 +279,25 @@ namespace connector {
     void connect(T & source, connector::GenericPassiveInputJack & target,
                  typename boost::disable_if< boost::is_base_of<connector::Jack, T> >::type * = 0);
 
-    void connect(connector::GenericActiveOutputJack & source, 
+    void connect(connector::GenericActiveOutputJack & source,
                  connector::GenericPassiveInputJack & target);
-    void connect(connector::GenericPassiveOutputJack & source, 
+    void connect(connector::GenericPassiveOutputJack & source,
                  connector::GenericActiveInputJack & target);
 
-    void connect(connector::GenericActiveOutputJack & source, 
+    void connect(connector::GenericActiveOutputJack & source,
                  connector::GenericPassiveInput & target);
-    void connect(connector::GenericPassiveOutputJack & source, 
+    void connect(connector::GenericPassiveOutputJack & source,
                  connector::GenericActiveInput & target);
 
-    void connect(connector::GenericActiveOutput & source, 
+    void connect(connector::GenericActiveOutput & source,
                  connector::GenericPassiveInputJack & target);
-    void connect(connector::GenericPassiveOutput & source, 
+    void connect(connector::GenericPassiveOutput & source,
                  connector::GenericActiveInputJack & target);
 
 #endif
 }}
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "Jack.cci"
 //#include "Jack.ct"
 #include "Jack.cti"