X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FDSMCCSection.hh;h=e6c2cef9ffd949bf11f585ad95fde912ccaf7b62;hb=ae06fe86f16fdabb7ffb219d255444d2eb4f4f79;hp=e0881f9035044bf3393146b3e881fa7f6742cb75;hpb=54eed72c506b09ef5b4be0b62fecedfbc0e3f261;p=senf.git

diff --git a/Packets/MPEGDVBBundle/DSMCCSection.hh b/Packets/MPEGDVBBundle/DSMCCSection.hh
index e0881f9..e6c2cef 100644
--- a/Packets/MPEGDVBBundle/DSMCCSection.hh
+++ b/Packets/MPEGDVBBundle/DSMCCSection.hh
@@ -45,23 +45,23 @@ namespace senf {
     {
 #       include SENF_FIXED_PARSER()
 
-        SENF_PARSE_FIELD( table_id, Parse_UInt8 );
+        SENF_PARSER_FIELD    ( table_id            , Parse_UInt8   );
         
-        SENF_PARSE_BITFIELD( ssi,                  1, bool     );
-        SENF_PARSE_BITFIELD( private_indicator,    1, bool     );
-        SENF_PARSE_BITFIELD( reserved_1,           2, unsigned );
-        SENF_PARSE_BITFIELD( sec_length,          12, unsigned );
-
-        SENF_PARSE_FIELD( table_id_extension, Parse_UInt16 );
+        SENF_PARSER_BITFIELD ( ssi                 ,  1 , bool     );
+        SENF_PARSER_BITFIELD ( private_indicator   ,  1 , bool     );
+        SENF_PARSER_SKIP_BITS( 2 );
+        SENF_PARSER_BITFIELD ( sec_length          , 12 , unsigned );
+        
+        SENF_PARSER_FIELD    ( table_id_extension  , Parse_UInt16  );
+        
+        SENF_PARSER_SKIP_BITS( 2 );
+        SENF_PARSER_BITFIELD ( version_num         ,  5 , unsigned );
+        SENF_PARSER_BITFIELD ( curr_next_indicator ,  1 , bool     );
 
-        SENF_PARSE_BITFIELD( reserved_2,           2, unsigned );
-        SENF_PARSE_BITFIELD( version_num,          5, unsigned );
-        SENF_PARSE_BITFIELD( curr_next_indicator,  1, bool     );
+        SENF_PARSER_FIELD    ( sec_num             , Parse_UInt8   );
+        SENF_PARSER_FIELD    ( last_sec_num        , Parse_UInt8   );
 
-        SENF_PARSE_FIELD( sec_num,            Parse_UInt8  );
-        SENF_PARSE_FIELD( last_sec_num,       Parse_UInt8  );
-        
-        SENF_PARSER_FINALIZE(Parse_DSMCCSection);
+        SENF_PARSER_FINALIZE( Parse_DSMCCSection );
 
         Parse_UInt32 crc() const { return parse<Parse_UInt32>( data().size()-4 ); }
     };