switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Packets / MPEGDVBBundle / TransportPacket.hh

diff --git a/senf/Packets/MPEGDVBBundle/TransportPacket.hh b/senf/Packets/MPEGDVBBundle/TransportPacket.hh
index 38200d5..05a6e49 100644 (file)
--- a/senf/Packets/MPEGDVBBundle/TransportPacket.hh
+++ b/senf/Packets/MPEGDVBBundle/TransportPacket.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief TransportPacket public header */
@@ -27,10 +32,10 @@
 #define HH_SENF_Packets_MPEGDVBBundle_TransportPacket_ 1
 
 // Custom includes
-#include "../../Packets/Packets.hh"
+#include <senf/Packets/Packets.hh>
 
 //#include "TransportPacket.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -38,7 +43,7 @@ namespace senf {
 
         Parser implementing the header of a MPEG Transport Stream packet.
         \image html TransportPacket.png
-        
+
         \see TransportPacketType
      */
     struct TransportPacketParser : public PacketParserBase
@@ -57,9 +62,9 @@ namespace senf {
 
         SENF_PARSER_PRIVATE_VARIANT ( pointer_field_, pusi,
                 (senf::VoidPacketParser) (UInt8Parser) );
-        
+
         SENF_PARSER_FINALIZE( TransportPacketParser );
-        
+
         UInt8Parser pointer_field() const;
         void init_fields() const;
         void setPUSI(bool pusi) const;
@@ -69,9 +74,9 @@ namespace senf {
             init_fields();
         }
     };
-    
+
     /** \brief Transport Stream packet
-        
+
         <table class="senf">
           <tr style="text-align:center">
             <th>Syntax</th><th>No. of bits</th></tr>
@@ -105,7 +110,7 @@ namespace senf {
           <tr>
             <td>}</td> <td></td></tr>
         </table>
-        
+
         \par Packet type (typedef):
             \ref TransportPacket
 
@@ -123,22 +128,22 @@ namespace senf {
 #endif
         typedef ConcretePacket<TransportPacketType> packet; ///< Transport packet typedef
         typedef TransportPacketParser parser; ///< typedef to the parser of Transport packet
-    
+
         using mixin::nextPacketRange;
         using mixin::init;
         using mixin::initSize;
-        
+
         /** \brief Dump given Transport packet in readable form to given output stream */
         static void dump(packet p, std::ostream & os);
         static const byte SYNC_BYTE = 0x47;
     };
-    
+
     /** \brief Transport packet typedef */
     typedef ConcretePacket<TransportPacketType> TransportPacket;
 }
 
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "TransportPacket.cci"
 //#include "TransportPacket.ct"
 //#include "TransportPacket.cti"