miscellaneous bits and bobs ;)

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

diff --git a/Packets/MPEGDVBBundle/TransportPacket.hh b/Packets/MPEGDVBBundle/TransportPacket.hh
index 7f21415..ab9d495 100644 (file)
--- a/Packets/MPEGDVBBundle/TransportPacket.hh
+++ b/Packets/MPEGDVBBundle/TransportPacket.hh
@@ -1,9 +1,9 @@
-// $Id:DatagramSection.hh 327 2007-07-20 10:03:44Z tho $
+// $Id:TransportPacket.hh 560 2007-12-13 14:39:37Z tho $
 //
 // 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
@@ -41,24 +41,24 @@ namespace senf {
         
         \see TransportPacketType
      */
-    struct Parse_TransportPacket : public PacketParserBase
+    struct TransportPacketParser : public PacketParserBase
     {
 #       include SENF_FIXED_PARSER()
 
-        SENF_PARSER_FIELD( sync_byte, Parse_UInt8 );
-        
-        SENF_PARSER_BITFIELD( transport_error_indicator,  1, bool     );
-        SENF_PARSER_BITFIELD( pusi,                       1, bool     );
-        SENF_PARSER_BITFIELD( transport_priority,         1, bool     );
-        SENF_PARSER_BITFIELD( pid,                       13, unsigned );
-        SENF_PARSER_BITFIELD( transport_scrmbl_ctrl,      2, unsigned );
-        SENF_PARSER_BITFIELD( adaptation_field_ctrl,      2, unsigned );
-        SENF_PARSER_BITFIELD( continuity_counter,         4, unsigned );
+        SENF_PARSER_FIELD    ( sync_byte,                  UInt8Parser  );
+
+        SENF_PARSER_BITFIELD ( transport_error_indicator,   1, bool     );
+        SENF_PARSER_BITFIELD ( pusi,                        1, bool     );
+        SENF_PARSER_BITFIELD ( transport_priority,          1, bool     );
+        SENF_PARSER_BITFIELD ( pid,                        13, unsigned );
+        SENF_PARSER_BITFIELD ( transport_scrmbl_ctrl,       2, unsigned );
+        SENF_PARSER_BITFIELD ( adaptation_field_ctrl,       2, unsigned );
+        SENF_PARSER_BITFIELD ( continuity_counter,          4, unsigned );
 
-        SENF_PARSER_FINALIZE( Parse_TransportPacket );
+        SENF_PARSER_FINALIZE( TransportPacketParser );
     
-//        Parse_UInt8 payload_pointer() const {
-//            return parse<Parse_UInt8>( Parse_TransportPacket::fixed_bytes ); 
+//        UInt8Parser payload_pointer() const {
+//            return parse<UInt8Parser>( TransportPacketParser::fixed_bytes ); 
 //        }
     };
     
@@ -71,28 +71,28 @@ namespace senf {
             <td>transport_packet() {</td> <td></td>
           </tr>
           <tr>
-            <td style="padding-left:2em">\ref Parse_TransportPacket::sync_byte() "sync_byte"</td>
+            <td style="padding-left:2em">\ref TransportPacketParser::sync_byte() "sync_byte"</td>
             <td>8</td></tr>
           <tr>
-            <td style="padding-left:2em">\ref Parse_TransportPacket::transport_error_indicator() "transport_error_indicator"</td>
+            <td style="padding-left:2em">\ref TransportPacketParser::transport_error_indicator() "transport_error_indicator"</td>
             <td>1</td></tr>
           <tr>
-            <td style="padding-left:2em">\ref Parse_TransportPacket::pusi() "payload_uni_start_indicator"</td>
+            <td style="padding-left:2em">\ref TransportPacketParser::pusi() "payload_uni_start_indicator"</td>
             <td>1</td></tr>
           <tr>
-            <td style="padding-left:2em">\ref Parse_TransportPacket::transport_priority() "transport_priority"</td>
+            <td style="padding-left:2em">\ref TransportPacketParser::transport_priority() "transport_priority"</td>
             <td>1</td></tr>
           <tr>
-            <td style="padding-left:2em">\ref Parse_TransportPacket::pid() "PID"</td>
+            <td style="padding-left:2em">\ref TransportPacketParser::pid() "PID"</td>
             <td>13</td></tr>
           <tr>
-            <td style="padding-left:2em">\ref Parse_TransportPacket::transport_scrmbl_ctrl() "transport_scrambling_control"</td>
+            <td style="padding-left:2em">\ref TransportPacketParser::transport_scrmbl_ctrl() "transport_scrambling_control"</td>
             <td>2</td></tr>
           <tr>
-            <td style="padding-left:2em">\ref Parse_TransportPacket::adaptation_field_ctrl() "adaptation_field_control"</td>
+            <td style="padding-left:2em">\ref TransportPacketParser::adaptation_field_ctrl() "adaptation_field_control"</td>
             <td>2</td></tr>
           <tr>
-            <td style="padding-left:2em">\ref Parse_TransportPacket::continuity_counter() "continuity_counter"</td>
+            <td style="padding-left:2em">\ref TransportPacketParser::continuity_counter() "continuity_counter"</td>
             <td>4</td></tr>
           <tr>
             <td>}</td> <td></td></tr>
@@ -102,7 +102,7 @@ namespace senf {
             \ref TransportPacket
 
         \par Fields:
-            \ref Parse_TransportPacket
+            \ref TransportPacketParser
 
         \ingroup protocolbundle_mpegdvb
      */
@@ -112,20 +112,18 @@ namespace senf {
     {
         typedef PacketTypeMixin<TransportPacketType> mixin;
         typedef ConcretePacket<TransportPacketType> packet;
-        typedef Parse_TransportPacket parser;
+        typedef TransportPacketParser parser;
     
         using mixin::nextPacketRange;
         using mixin::init;
         using mixin::initSize;
         
         static void dump(packet p, std::ostream & os);
+        static const byte SYNC_BYTE = 0x47;
     };
     
     /** \brief Transport packet typedef */
-    typedef TransportPacketType::packet TransportPacket;
-    
-    #define TRANSPORT_PACKET_SYNC_BYTE 0x47
-  
+    typedef ConcretePacket<TransportPacketType> TransportPacket;
 }