X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FTLVPacket.hh;h=f81eafd99b224ea72a71ca7297975603692c6aeb;hb=96d3a2a43b4e6d7693a136a3adeb099440f19068;hp=e0ff4e059956f574e7576ac62eca0fc30eddaf56;hpb=759f89cf0952cbc42207e5c4cf059d3906a37e59;p=senf.git

diff --git a/Packets/MPEGDVBBundle/TLVPacket.hh b/Packets/MPEGDVBBundle/TLVPacket.hh
index e0ff4e0..f81eafd 100644
--- a/Packets/MPEGDVBBundle/TLVPacket.hh
+++ b/Packets/MPEGDVBBundle/TLVPacket.hh
@@ -28,9 +28,7 @@
 
 // Custom includes
 #include <algorithm>
-#include "../../Packets/PacketType.hh"
-#include "../../Packets/ParseInt.hh"
-#include "../../Packets/PacketParser.hh"
+#include "../../Packets/Packets.hh"
 
 //#include "TLVPacket.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -49,11 +47,7 @@ namespace senf {
           public PacketParserBase
     {
     public:
-#       ifndef DOXYGEN
-        
-        SENF_PACKET_PARSER_NO_INIT(Parse_TLVPacketLength);
-
-#       endif
+        Parse_TLVPacketLength(data_iterator i, state_type s) : PacketParserBase(i,s) {}
 
         typedef boost::uint32_t value_type;
     
@@ -92,16 +86,12 @@ namespace senf {
      */
     struct Parse_TLVPacket : public PacketParserBase
     {
-#       ifndef DOXYGEN
-        
-        SENF_PACKET_PARSER_INIT(Parse_TLVPacket);
+#       include SENF_PARSER()
         
-        SENF_PACKET_PARSER_DEFINE_FIELDS(
-            ((Field)( type,   Parse_UInt32          ))
-            ((Field)( length, Parse_TLVPacketLength ))
-        );
+        SENF_PARSER_FIELD( type,   Parse_UInt32 );
+        SENF_PARSER_FIELD( length, Parse_TLVPacketLength );
         
-#       endif
+        SENF_PARSER_FINALIZE(Parse_TLVPacket);
     };
 
     /** \brief TLV Packet