Utils/Logger: Implement targets

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

diff --git a/Packets/MPEGDVBBundle/TLVPacket.hh b/Packets/MPEGDVBBundle/TLVPacket.hh
index e0ff4e0..f52da1c 100644 (file)
--- 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;
     
@@ -86,25 +80,22 @@ namespace senf {
         
     /** \brief parse TLVPacket Packet
     
-        XXX
+
         
         \see TLVPacketType
      */
     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
+        \image html TLV.png
         
         \par Packet type (typedef):
             \ref TLVPacket