switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/MPEGDVBBundle/TransportPacket.cc b/senf/Packets/MPEGDVBBundle/TransportPacket.cc
index 514d95f..0dfde29 100644 (file)
--- a/senf/Packets/MPEGDVBBundle/TransportPacket.cc
+++ b/senf/Packets/MPEGDVBBundle/TransportPacket.cc
@@ -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 non-inline non-template implementation */
@@ -31,7 +36,7 @@
 #include <boost/io/ios_state.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ void senf::TransportPacketParser::init_fields()
     const
@@ -45,7 +50,7 @@ prefix_ void senf::TransportPacketParser::init_fields()
 prefix_ senf::UInt8Parser senf::TransportPacketParser::pointer_field()
     const
 {
-    return pointer_field_().get<1>(); 
+    return pointer_field_().get<1>();
 }
 
 prefix_ void senf::TransportPacketParser::setPUSI(bool pusi)
@@ -54,27 +59,27 @@ prefix_ void senf::TransportPacketParser::setPUSI(bool pusi)
     if (pusi) pointer_field_().init<1>();
     else      pointer_field_().init<0>();
 }
-            
+
 prefix_ void senf::TransportPacketType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
     os << "TransportPacket:\n"
        << std::hex
-       <<     "  syncByte                : 0x" << unsigned(p->sync_byte()) << "\n"
-       <<     "  transport error ind.    : 0x" << unsigned(p->transport_error_indicator()) << "\n"
-       <<     "  payload unit start ind. : 0x" << unsigned(p->pusi()) << "\n"
-       <<     "  transport priority      : 0x" << unsigned(p->transport_priority()) << "\n"
+       << senf::fieldName("syncByte")                  << "0x" << unsigned(p->sync_byte()) << "\n"
+       << senf::fieldName("transport error ind.")      << "0x" << unsigned(p->transport_error_indicator()) << "\n"
+       << senf::fieldName("payload unit start ind.")   << "0x" << unsigned(p->pusi()) << "\n"
+       << senf::fieldName("transport priority")        << "0x" << unsigned(p->transport_priority()) << "\n"
        << std::dec
-       <<     "  pid                     : " << unsigned(p->pid()) << "\n"
+       << senf::fieldName("pid")                       << unsigned(p->pid()) << "\n"
        << std::hex
-       <<     "  transport scrambling c. : 0x" << unsigned(p->transport_scrmbl_ctrl()) << "\n"
-       <<     "  adaptation field ctrl   : 0x" << unsigned(p->adaptation_field_ctrl()) << "\n"
-       <<     "  continuity counter      : 0x" << unsigned(p->continuity_counter()) << "\n";
+       << senf::fieldName("transport scrambling c.")   << "0x" << unsigned(p->transport_scrmbl_ctrl()) << "\n"
+       << senf::fieldName("adaptation field ctrl")     << "0x" << unsigned(p->adaptation_field_ctrl()) << "\n"
+       << senf::fieldName("continuity counter")        << "0x" << unsigned(p->continuity_counter()) << "\n";
     if (p->pusi())
-        os << "  pointer field           : 0x" << unsigned(p->pointer_field()) << "\n";
+        os << senf::fieldName("pointer field")         << "0x" << unsigned(p->pointer_field()) << "\n";
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f