X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FSNDUPacket.hh;h=1b699128c511788e9a5d0a0d4a6f608eb31636b7;hb=fd3a0e8ac95d1158e9ea661ddf9187b67c70169f;hp=7cb9e761e8ca1085c5c76e4648a4a7a4a7c7dee2;hpb=759310ea14e1fa1eb65f029762efa32d52539e59;p=senf.git

diff --git a/Packets/MPEGDVBBundle/SNDUPacket.hh b/Packets/MPEGDVBBundle/SNDUPacket.hh
index 7cb9e76..1b69912 100644
--- a/Packets/MPEGDVBBundle/SNDUPacket.hh
+++ b/Packets/MPEGDVBBundle/SNDUPacket.hh
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
+// 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
@@ -23,8 +23,8 @@
 /** \file
     \brief SNDUPacket public header */
 
-#ifndef HH_SNDUPacket_
-#define HH_SNDUPacket_ 1
+#ifndef HH_SENF_Packets_MPEGDVBBundle_SNDUPacket_
+#define HH_SENF_Packets_MPEGDVBBundle_SNDUPacket_ 1
 
 // Custom includes
 #include <algorithm>
@@ -43,7 +43,7 @@ namespace senf {
         
         \see SNDUPacketType
      */
-    struct Parse_SNDUPacket : public PacketParserBase
+    struct SNDUPacketParser : public PacketParserBase
     {
 #       include SENF_PARSER()
 
@@ -52,13 +52,13 @@ namespace senf {
 
         SENF_PARSER_PRIVATE_BITFIELD ( d_bit_       ,  1 , unsigned );
         SENF_PARSER_BITFIELD         ( length       , 15 , unsigned );
-        SENF_PARSER_FIELD            ( type         , Parse_UInt16  );
+        SENF_PARSER_FIELD            ( type         , UInt16Parser  );
         SENF_PARSER_PRIVATE_VARIANT  ( destination_ , d_bit_        , 
-                                                      (Parse_MAC) (VoidPacketParser) );
+                                                      (MACAddressParser) (VoidPacketParser) );
         
-        SENF_PARSER_FINALIZE( Parse_SNDUPacket );
+        SENF_PARSER_FINALIZE( SNDUPacketParser );
         
-        Parse_MAC destination()         /// Only defined if d_bit() == \c false
+        MACAddressParser destination()         /// Only defined if d_bit() == \c false
             { return destination_().get<0>(); }
 
         bool d_bit()                    /// Destination absent bit
@@ -70,8 +70,8 @@ namespace senf {
         void withoutDestination()       /// Set destination absent bit
             { destination_().init<1>(); }
 
-        Parse_UInt32 crc() 
-            { return parse<Parse_UInt32>( data().size() - 4 ); }
+        UInt32Parser crc() 
+            { return parse<UInt32Parser>( data().size() - 4 ); }
 
         boost::uint32_t calcCrc() const;
     };
@@ -87,7 +87,8 @@ namespace senf {
             \ref SNDUPacket
 
         \par Fields:
-            \ref Parse_SNDUPacket
+            \ref SNDUPacketParser
+            \image html SNDUPacket.png
 
         \ingroup protocolbundle_mpegdvb
      */
@@ -97,13 +98,13 @@ namespace senf {
     {
 //        typedef PacketTypeMixin<SNDUPacketType, ULEExtHeaderType> mixin;
         typedef ConcretePacket<SNDUPacketType> packet;
-        typedef Parse_SNDUPacket parser;
+        typedef SNDUPacketParser parser;
 
 //        using mixin::nextPacketRange;
 //        using mixin::nextPacketType;
 //        using mixin::init;
         
-//        static registry_key_t nextPacketKey(packet p);
+//        static key_t nextPacketKey(packet p);
         
         static void init(packet p);