Removed superfluous white space; added RCS Id

1 files changed, 141 insertions, 274 deletions

diff --git a/libsi/headers.h b/libsi/headers.h
index e8bef639..d5c11999 100644
--- a/libsi/headers.h
+++ b/libsi/headers.h
@@ -1,15 +1,17 @@
 /***************************************************************************
- *                                                                         *     
+ *                                                                         *
  *   (C) 2001-03 Rolf Hakenes <hakenes@hippomi.de>, under the              *
  *               GNU GPL with contribution of Oleg Assovski,               *
  *               www.satmania.com                                          *
- *               Adapted and extended by Marcel Wiesweg                                 *
+ *               Adapted and extended by Marcel Wiesweg                    *
  *                                                                         *
  *   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  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
+ *   $Id: headers.h 1.2 2003/12/13 10:43:26 kls Exp $
+ *                                                                         *
  ***************************************************************************/
 
 #ifndef LIBSI_HEADERS_H
@@ -22,29 +24,29 @@ namespace SI {
 typedef unsigned char u_char;
 
 struct SectionHeader {
-   u_char table_id                               :8; 
+   u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char section_syntax_indicator               :1; 
-   u_char                                        :3; 
-   u_char section_length_hi                      :4; 
-#else 
-   u_char section_length_hi                      :4; 
-   u_char                                        :3; 
-   u_char section_syntax_indicator               :1; 
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
 #endif
-   u_char section_length_lo                      :8; 
+   u_char section_length_lo                      :8;
 };
 
 struct ExtendedSectionHeader {
-   u_char table_id                               :8; 
+   u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char section_syntax_indicator               :1; 
-   u_char                                        :3; 
-   u_char section_length_hi                      :4; 
-#else 
-   u_char section_length_hi                      :4; 
-   u_char                                        :3; 
-   u_char section_syntax_indicator               :1; 
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
 #endif
    u_char section_length_lo                      :8;
    u_char table_id_extension_hi                  :8;
@@ -127,7 +129,7 @@ struct pat_prog {
    u_char network_pid_hi                         :5;
    u_char                                        :3;
 #endif
-   u_char network_pid_lo                         :8; 
+   u_char network_pid_lo                         :8;
    /* or program_map_pid (if prog_num=0)*/
 };
 
@@ -263,78 +265,78 @@ struct pmt_info {
  *
  */
 
-#define NIT_LEN 10 
+#define NIT_LEN 10
 
-struct nit { 
-   u_char table_id                               :8; 
+struct nit {
+   u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char section_syntax_indicator               :1; 
-   u_char                                        :3; 
-   u_char section_length_hi                      :4; 
-#else 
-   u_char section_length_hi                      :4; 
-   u_char                                        :3; 
-   u_char section_syntax_indicator               :1; 
+   u_char section_syntax_indicator               :1;
+   u_char                                        :3;
+   u_char section_length_hi                      :4;
+#else
+   u_char section_length_hi                      :4;
+   u_char                                        :3;
+   u_char section_syntax_indicator               :1;
 #endif
-   u_char section_length_lo                      :8; 
-   u_char network_id_hi                          :8; 
-   u_char network_id_lo                          :8; 
+   u_char section_length_lo                      :8;
+   u_char network_id_hi                          :8;
+   u_char network_id_lo                          :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char                                        :2; 
-   u_char version_number                         :5; 
-   u_char current_next_indicator                 :1; 
+   u_char                                        :2;
+   u_char version_number                         :5;
+   u_char current_next_indicator                 :1;
 #else
-   u_char current_next_indicator                 :1; 
-   u_char version_number                         :5; 
-   u_char                                        :2; 
+   u_char current_next_indicator                 :1;
+   u_char version_number                         :5;
+   u_char                                        :2;
 #endif
-   u_char section_number                         :8; 
-   u_char last_section_number                    :8; 
-#if BYTE_ORDER == BIG_ENDIAN 
-   u_char                                        :4; 
-   u_char network_descriptor_length_hi           :4; 
+   u_char section_number                         :8;
+   u_char last_section_number                    :8;
+#if BYTE_ORDER == BIG_ENDIAN
+   u_char                                        :4;
+   u_char network_descriptor_length_hi           :4;
 #else
-   u_char network_descriptor_length_hi           :4; 
-   u_char                                        :4; 
+   u_char network_descriptor_length_hi           :4;
+   u_char                                        :4;
 #endif
-   u_char network_descriptor_length_lo           :8; 
+   u_char network_descriptor_length_lo           :8;
   /* descriptors */
-}; 
- 
-#define SIZE_NIT_MID 2 
+};
+
+#define SIZE_NIT_MID 2
 
-struct nit_mid {                                 // after descriptors 
+struct nit_mid {                                 // after descriptors
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char                                        :4; 
-   u_char transport_stream_loop_length_hi        :4; 
+   u_char                                        :4;
+   u_char transport_stream_loop_length_hi        :4;
 #else
-   u_char transport_stream_loop_length_hi        :4; 
-   u_char                                        :4; 
+   u_char transport_stream_loop_length_hi        :4;
+   u_char                                        :4;
 #endif
-   u_char transport_stream_loop_length_lo        :8; 
-}; 
- 
-#define SIZE_NIT_END 4 
-
-struct nit_end { 
-   long CRC; 
-}; 
- 
-#define NIT_TS_LEN 6 
-
-struct ni_ts { 
-   u_char transport_stream_id_hi                 :8; 
-   u_char transport_stream_id_lo                 :8; 
-   u_char original_network_id_hi                 :8; 
-   u_char original_network_id_lo                 :8; 
+   u_char transport_stream_loop_length_lo        :8;
+};
+
+#define SIZE_NIT_END 4
+
+struct nit_end {
+   long CRC;
+};
+
+#define NIT_TS_LEN 6
+
+struct ni_ts {
+   u_char transport_stream_id_hi                 :8;
+   u_char transport_stream_id_lo                 :8;
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char                                        :4; 
-   u_char transport_descriptors_length_hi        :4; 
-#else  
-   u_char transport_descriptors_length_hi        :4; 
-   u_char                                        :4; 
+   u_char                                        :4;
+   u_char transport_descriptors_length_hi        :4;
+#else
+   u_char transport_descriptors_length_hi        :4;
+   u_char                                        :4;
 #endif
-   u_char transport_descriptors_length_lo        :8; 
+   u_char transport_descriptors_length_lo        :8;
    /* descriptors  */
 };
 
@@ -426,7 +428,7 @@ struct sdt_descr {
 /*
  *
  *    3) Event Information Table (EIT):
- * 
+ *
  *       - the EIT contains data concerning events or programmes such as event
  *         name, start time, duration, etc.; - the use of different descriptors
  *         allows the transmission of different kinds of event information e.g.
@@ -505,7 +507,7 @@ struct eit_event {
  */
 
 struct rst {
-   u_char table_id                               :8; 
+   u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
    u_char                                        :3;
@@ -516,7 +518,7 @@ struct rst {
    u_char section_syntax_indicator               :1;
 #endif
    u_char section_length_lo                      :8;
-}; 
+};
 
 struct rst_info {
    u_char transport_stream_id_hi                 :8;
@@ -549,7 +551,7 @@ struct rst_info {
 #define TDT_LEN 8
 
 struct tdt {
-   u_char table_id                               :8; 
+   u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
    u_char                                        :3;
@@ -579,7 +581,7 @@ struct tdt {
 #define TOT_LEN 10
 
 struct tot {
-   u_char table_id                               :8; 
+   u_char table_id                               :8;
 #if BYTE_ORDER == BIG_ENDIAN
    u_char section_syntax_indicator               :1;
    u_char                                        :3;
@@ -605,7 +607,6 @@ struct tot {
    u_char descriptors_loop_length_lo             :8;
 };
 
-
 /*
  *
  *    7) Stuffing Table (ST):
@@ -637,11 +638,11 @@ struct tot {
  *
  */
     /* TO BE DONE */
-    
+
 /*
  *
  *    3) Application Information Table (AIT):
- * 
+ *
  *       - the AIT contains data concerning MHP application broadcast by a service.
  *
  */
@@ -685,50 +686,48 @@ struct ait {
 
 #define SIZE_AIT_MID 2
 
-struct ait_mid {                                 // after descriptors 
+struct ait_mid {                                 // after descriptors
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char                                        :4; 
-   u_char application_loop_length_hi             :4; 
+   u_char                                        :4;
+   u_char application_loop_length_hi             :4;
 #else
-   u_char application_loop_length_hi             :4; 
-   u_char                                        :4; 
+   u_char application_loop_length_hi             :4;
+   u_char                                        :4;
 #endif
-   u_char application_loop_length_lo             :8; 
-}; 
- 
-#define SIZE_AIT_END 4 
+   u_char application_loop_length_lo             :8;
+};
+
+#define SIZE_AIT_END 4
 
-struct ait_end { 
-   long CRC; 
-}; 
+struct ait_end {
+   long CRC;
+};
 
 #define AIT_APP_LEN 9
 
-struct ait_app { 
+struct ait_app {
    //how to deal with 32 bit fields?
 
-   u_char organisation_id_hi_hi                  :8; 
-   u_char organisation_id_hi_lo                  :8; 
-   u_char organisation_id_lo_hi                  :8; 
-   u_char organisation_id_lo_lo                  :8; 
+   u_char organisation_id_hi_hi                  :8;
+   u_char organisation_id_hi_lo                  :8;
+   u_char organisation_id_lo_hi                  :8;
+   u_char organisation_id_lo_lo                  :8;
 
    //long organisation_id                          :32;
    u_char application_id_hi                      :8;
    u_char application_id_lo                      :8;
    u_char application_control_code               :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char                                        :4; 
-   u_char application_descriptors_length_hi      :4; 
-#else  
-   u_char application_descriptors_length_hi      :4; 
-   u_char                                        :4; 
+   u_char                                        :4;
+   u_char application_descriptors_length_hi      :4;
+#else
+   u_char application_descriptors_length_hi      :4;
+   u_char                                        :4;
 #endif
-   u_char application_descriptors_length_lo      :8; 
+   u_char application_descriptors_length_lo      :8;
    /* descriptors  */
 };
 
-
-
 /*
  *
  *    The following describes the different descriptors that can be used within
@@ -754,11 +753,9 @@ struct descr_gen {
    u_char descriptor_length                      :8;
 };
 
-
 #define GetDescriptorTag(x) (((descr_gen_t *) x)->descriptor_tag)
 #define GetDescriptorLength(x) (((descr_gen_t *) x)->descriptor_length+DESCR_GEN_LEN)
 
-
 /* 0x09 ca_descriptor */
 
 #define DESCR_CA_LEN 6
@@ -777,7 +774,6 @@ struct descr_ca {
    u_char CA_PID_lo                              :8;
 };
 
-
 /* 0x0A iso_639_language_descriptor */
 
 #define DESCR_ISO_639_LANGUAGE_LEN 5
@@ -789,8 +785,6 @@ struct descr_iso_639_language {
    u_char lang_code3                             :8;
 };
 
-
-
 /* 0x13 carousel_identifier_descriptor */
 
 #define DESCR_CAROUSEL_IDENTIFIER_LEN 7
@@ -805,8 +799,6 @@ struct descr_carousel_identifier {
    /* FormatSpecifier follows */
 };
 
-
-
 /* 0x40 network_name_descriptor */
 
 #define DESCR_NETWORK_NAME_LEN 2
@@ -815,8 +807,6 @@ struct descr_network_name {
    u_char descriptor_length                      :8;
 };
 
-
-
 /* 0x41 service_list_descriptor */
 
 #define DESCR_SERVICE_LIST_LEN 2
@@ -825,7 +815,6 @@ struct descr_service_list {
    u_char descriptor_length                      :8;
 };
 
-
 #define DESCR_SERVICE_LIST_LOOP_LEN 3
 struct descr_service_list_loop {
    u_char service_id_hi                          :8;
@@ -833,8 +822,6 @@ struct descr_service_list_loop {
    u_char service_type                           :8;
 };
 
-
-
 /* 0x42 stuffing_descriptor */
 
 #define DESCR_STUFFING_LEN XX
@@ -844,8 +831,6 @@ struct descr_stuffing {
    /* TBD */
 };
 
-
-
 /* 0x43 satellite_delivery_system_descriptor */
 
 #define DESCR_SATELLITE_DELIVERY_SYSTEM_LEN 13
@@ -879,8 +864,6 @@ struct descr_satellite_delivery_system {
 #endif
 };
 
-
-
 /* 0x44 cable_delivery_system_descriptor */
 
 #define DESCR_CABLE_DELIVERY_SYSTEM_LEN 13
@@ -912,8 +895,6 @@ struct descr_cable_delivery_system {
 #endif
 };
 
-
-
 /* 0x45 vbi_data_descriptor */
 
 #define DESCR_VBI_DATA_LEN XX
@@ -923,8 +904,6 @@ struct descr_vbi_data {
    /* TBD */
 };
 
-
-
 /* 0x46 vbi_teletext_descriptor */
 
 #define DESCR_VBI_TELETEXT_LEN XX
@@ -934,8 +913,6 @@ struct descr_vbi_teletext {
    /* TBD */
 };
 
-
-
 /* 0x47 bouquet_name_descriptor */
 
 #define DESCR_BOUQUET_NAME_LEN 2
@@ -944,8 +921,6 @@ struct descr_bouquet_name {
    u_char descriptor_length                      :8;
 };
 
-
-
 /* 0x48 service_descriptor */
 
 #define DESCR_SERVICE_LEN  4
@@ -960,8 +935,6 @@ struct descr_service_mid {
    u_char service_name_length                   :8;
 };
 
-
-
 /* 0x49 country_availability_descriptor */
 
 #define DESCR_COUNTRY_AVAILABILITY_LEN 3
@@ -977,8 +950,6 @@ struct descr_country_availability {
 #endif
 };
 
-
-
 /* 0x4A linkage_descriptor */
 
 #define DESCR_LINKAGE_LEN 9
@@ -987,15 +958,13 @@ struct descr_linkage {
    u_char descriptor_length                      :8;
    u_char transport_stream_id_hi                 :8;
    u_char transport_stream_id_lo                 :8;
-   u_char original_network_id_hi                 :8; 
-   u_char original_network_id_lo                 :8; 
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
    u_char service_id_hi                          :8;
    u_char service_id_lo                          :8;
    u_char linkage_type                           :8;
 };
 
-
-
 /* 0x4B nvod_reference_descriptor */
 
 #define DESCR_NVOD_REFERENCE_LEN 2
@@ -1004,20 +973,16 @@ struct descr_nvod_reference {
    u_char descriptor_length                      :8;
 };
 
-
 #define ITEM_NVOD_REFERENCE_LEN 6
 struct item_nvod_reference {
    u_char transport_stream_id_hi                 :8;
    u_char transport_stream_id_lo                 :8;
-   u_char original_network_id_hi                 :8; 
-   u_char original_network_id_lo                 :8; 
+   u_char original_network_id_hi                 :8;
+   u_char original_network_id_lo                 :8;
    u_char service_id_hi                          :8;
    u_char service_id_lo                          :8;
 };
 
-
-
-
 /* 0x4C time_shifted_service_descriptor */
 
 #define DESCR_TIME_SHIFTED_SERVICE_LEN 4
@@ -1028,8 +993,6 @@ struct descr_time_shifted_service {
    u_char reference_service_id_lo                :8;
 };
 
-
-
 /* 0x4D short_event_descriptor */
 
 #define DESCR_SHORT_EVENT_LEN 6
@@ -1046,8 +1009,6 @@ struct descr_short_event_mid {
    u_char text_length                      :8;
 };
 
-
-
 /* 0x4E extended_event_descriptor */
 
 #define DESCR_EXTENDED_EVENT_LEN 7
@@ -1072,7 +1033,6 @@ struct descr_extended_event_mid {
    u_char text_length                            :8;
 };
 
-
 #define ITEM_EXTENDED_EVENT_LEN 1
 struct item_extended_event {
    u_char item_description_length                :8;
@@ -1082,8 +1042,6 @@ struct item_extended_event_mid {
    u_char item_length                            :8;
 };
 
-
-
 /* 0x4F time_shifted_event_descriptor */
 
 #define DESCR_TIME_SHIFTED_EVENT_LEN 6
@@ -1096,8 +1054,6 @@ struct descr_time_shifted_event {
    u_char reference_event_id_lo                  :8;
 };
 
-
-
 /* 0x50 component_descriptor */
 
 #define DESCR_COMPONENT_LEN  8
@@ -1118,8 +1074,6 @@ struct descr_component {
    u_char lang_code3                             :8;
 };
 
-
-
 /* 0x51 mosaic_descriptor */
 
 #define DESCR_MOSAIC_LEN XX
@@ -1129,8 +1083,6 @@ struct descr_mosaic {
    /* TBD */
 };
 
-
-
 /* 0x52 stream_identifier_descriptor */
 
 #define DESCR_STREAM_IDENTIFIER_LEN 3
@@ -1140,8 +1092,6 @@ struct descr_stream_identifier {
    u_char component_tag                          :8;
 };
 
-
-
 /* 0x53 ca_identifier_descriptor */
 
 #define DESCR_CA_IDENTIFIER_LEN 2
@@ -1150,8 +1100,6 @@ struct descr_ca_identifier {
    u_char descriptor_length                      :8;
 };
 
-
-
 /* 0x54 content_descriptor */
 
 #define DESCR_CONTENT_LEN 2
@@ -1160,7 +1108,6 @@ struct descr_content {
    u_char descriptor_length                      :8;
 };
 
-
 struct nibble_content {
 #if BYTE_ORDER == BIG_ENDIAN
    u_char content_nibble_level_1                 :4;
@@ -1178,8 +1125,6 @@ struct nibble_content {
 #endif
 };
 
-
-
 /* 0x55 parental_rating_descriptor */
 
 #define DESCR_PARENTAL_RATING_LEN 2
@@ -1188,7 +1133,6 @@ struct descr_parental_rating {
    u_char descriptor_length                      :8;
 };
 
-
 #define PARENTAL_RATING_LEN 4
 struct parental_rating {
    u_char lang_code1                             :8;
@@ -1197,8 +1141,6 @@ struct parental_rating {
    u_char rating                                 :8;
 };
 
-
-
 /* 0x56 teletext_descriptor */
 
 #define DESCR_TELETEXT_LEN 2
@@ -1207,24 +1149,21 @@ struct descr_teletext {
    u_char descriptor_length                      :8;
 };
 
-
 #define ITEM_TELETEXT_LEN 5
 struct item_teletext {
    u_char lang_code1                             :8;
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char type                                   :5; 
-   u_char magazine_number                        :3; 
-#else 
-   u_char magazine_number                        :3; 
-   u_char type                                   :5; 
-#endif 
-   u_char page_number                            :8; 
+   u_char type                                   :5;
+   u_char magazine_number                        :3;
+#else
+   u_char magazine_number                        :3;
+   u_char type                                   :5;
+#endif
+   u_char page_number                            :8;
 };
 
-
-
 /* 0x57 telephone_descriptor */
 
 #define DESCR_TELEPHONE_LEN XX
@@ -1234,8 +1173,6 @@ struct descr_telephone {
    /* TBD */
 };
 
-
-
 /* 0x58 local_time_offset_descriptor */
 
 #define DESCR_LOCAL_TIME_OFFSET_LEN 2
@@ -1244,7 +1181,6 @@ struct descr_local_time_offset {
    u_char descriptor_length                      :8;
 };
 
-
 #define LOCAL_TIME_OFFSET_ENTRY_LEN 15
 struct local_time_offset_entry {
    u_char country_code1                          :8;
@@ -1270,8 +1206,6 @@ struct local_time_offset_entry {
    u_char next_time_offset_m                     :8;
 };
 
-
-
 /* 0x59 subtitling_descriptor */
 
 #define DESCR_SUBTITLING_LEN 2
@@ -1280,21 +1214,18 @@ struct descr_subtitling {
    u_char descriptor_length                      :8;
 };
 
-
 #define ITEM_SUBTITLING_LEN 8
 struct item_subtitling {
    u_char lang_code1                             :8;
    u_char lang_code2                             :8;
    u_char lang_code3                             :8;
-   u_char subtitling_type                        :8; 
-   u_char composition_page_id_hi                 :8; 
-   u_char composition_page_id_lo                 :8; 
-   u_char ancillary_page_id_hi                   :8; 
-   u_char ancillary_page_id_lo                   :8; 
+   u_char subtitling_type                        :8;
+   u_char composition_page_id_hi                 :8;
+   u_char composition_page_id_lo                 :8;
+   u_char ancillary_page_id_hi                   :8;
+   u_char ancillary_page_id_lo                   :8;
 };
 
-
-
 /* 0x5A terrestrial_delivery_system_descriptor */
 
 #define DESCR_TERRESTRIAL_DELIVERY_SYSTEM_LEN XX
@@ -1338,8 +1269,6 @@ struct descr_terrestrial_delivery {
    u_char reserver5                              :8;
 };
 
-
-
 /* 0x5B multilingual_network_name_descriptor */
 
 #define DESCR_MULTILINGUAL_NETWORK_NAME_LEN XX
@@ -1355,8 +1284,6 @@ struct entry_multilingual_name {
    u_char text_length                            :8;
 };
 
-
-
 /* 0x5C multilingual_bouquet_name_descriptor */
 
 #define DESCR_MULTILINGUAL_BOUQUET_NAME_LEN XX
@@ -1365,8 +1292,6 @@ struct descr_multilingual_bouquet_name {
    u_char descriptor_length                      :8;
 };
 
-
-
 /* 0x5D multilingual_service_name_descriptor */
 
 #define DESCR_MULTILINGUAL_SERVICE_NAME_LEN XX
@@ -1379,7 +1304,6 @@ struct entry_multilingual_service_name_mid {
    u_char service_name_length                    :8;
 };
 
-
 /* 0x5E multilingual_component_descriptor */
 
 #define DESCR_MULTILINGUAL_COMPONENT_LEN XX
@@ -1389,8 +1313,6 @@ struct descr_multilingual_component {
    u_char component_tag                          :8;
 };
 
-
-
 /* 0x5F private_data_specifier_descriptor */
 
 #define DESCR_PRIVATE_DATA_SPECIFIER_LEN XX
@@ -1400,8 +1322,6 @@ struct descr_private_data_specifier {
    /* TBD */
 };
 
-
-
 /* 0x60 service_move_descriptor */
 
 #define DESCR_SERVICE_MOVE_LEN XX
@@ -1416,8 +1336,6 @@ struct descr_service_move {
    u_char new_service_id_lo                      :8;
 };
 
-
-
 /* 0x61 short_smoothing_buffer_descriptor */
 
 #define DESCR_SHORT_SMOOTHING_BUFFER_LEN XX
@@ -1427,15 +1345,13 @@ struct descr_short_smoothing_buffer {
    /* TBD */
 };
 
-
-
 /* 0x62 frequency_list_descriptor */
 
 #define DESCR_FREQUENCY_LIST_LEN XX
 struct descr_frequency_list {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-#if BYTE_ORDER == BIG_ENDIAN   
+#if BYTE_ORDER == BIG_ENDIAN
    u_char                                        :6;
    u_char coding_type                            :2;
 #else
@@ -1444,8 +1360,6 @@ struct descr_frequency_list {
 #endif
 };
 
-
-
 /* 0x63 partial_transport_stream_descriptor */
 
 #define DESCR_PARTIAL_TRANSPORT_STREAM_LEN XX
@@ -1455,8 +1369,6 @@ struct descr_partial_transport_stream {
    /* TBD */
 };
 
-
-
 /* 0x64 data_broadcast_descriptor */
 
 #define DESCR_DATA_BROADCAST_LEN XX
@@ -1466,8 +1378,6 @@ struct descr_data_broadcast {
    /* TBD */
 };
 
-
-
 /* 0x65 ca_system_descriptor */
 
 #define DESCR_CA_SYSTEM_LEN XX
@@ -1477,8 +1387,6 @@ struct descr_ca_system {
    /* TBD */
 };
 
-
-
 /* 0x66 data_broadcast_id_descriptor */
 
 #define DESCR_DATA_BROADCAST_ID_LEN XX
@@ -1488,8 +1396,6 @@ struct descr_data_broadcast_id {
    /* TBD */
 };
 
-
-
 /* 0x67 transport_stream_descriptor */
 
 #define DESCR_TRANSPORT_STREAM_LEN XX
@@ -1499,8 +1405,6 @@ struct descr_transport_stream {
    /* TBD */
 };
 
-
-
 /* 0x68 dsng_descriptor */
 
 #define DESCR_DSNG_LEN XX
@@ -1510,8 +1414,6 @@ struct descr_dsng {
    /* TBD */
 };
 
-
-
 /* 0x69 pdc_descriptor */
 
 #define DESCR_PDC_LEN XX
@@ -1521,8 +1423,6 @@ struct descr_pdc {
    /* TBD */
 };
 
-
-
 /* 0x6A ac3_descriptor */
 
 #define DESCR_AC3_LEN 3
@@ -1548,8 +1448,6 @@ struct descr_ac3 {
    u_char asvc                                   :8;
 };
 
-
-
 /* 0x6B ancillary_data_descriptor */
 
 #define DESCR_ANCILLARY_DATA_LEN 3
@@ -1559,8 +1457,6 @@ struct descr_ancillary_data {
    u_char ancillary_data_identifier              :8;
 };
 
-
-
 /* 0x6C cell_list_descriptor */
 
 #define DESCR_CELL_LIST_LEN XX
@@ -1570,8 +1466,6 @@ struct descr_cell_list {
    /* TBD */
 };
 
-
-
 /* 0x6D cell_frequency_link_descriptor */
 
 #define DESCR_CELL_FREQUENCY_LINK_LEN XX
@@ -1581,8 +1475,6 @@ struct descr_cell_frequency_link {
    /* TBD */
 };
 
-
-
 /* 0x6E announcement_support_descriptor */
 
 #define DESCR_ANNOUNCEMENT_SUPPORT_LEN XX
@@ -1592,8 +1484,6 @@ struct descr_announcement_support {
    /* TBD */
 };
 
-
-
 /* 0x6F application_signalling_descriptor */
 
 #define DESCR_APPLICATION_SIGNALLING_LEN 2
@@ -1602,22 +1492,19 @@ struct descr_application_signalling {
    u_char descriptor_length                      :8;
 };
 
-
 #define APPLICATION_SIGNALLING_ENTRY_LEN 3
 struct application_signalling_entry {
-   u_char application_type_hi                    :8;   
-   u_char application_type_lo                    :8;   
+   u_char application_type_hi                    :8;
+   u_char application_type_lo                    :8;
 #if BYTE_ORDER == BIG_ENDIAN
-   u_char                                        :3; 
+   u_char                                        :3;
    u_char AIT_version_number                     :5;
 #else
    u_char AIT_version_number                     :5;
-   u_char                                        :3; 
+   u_char                                        :3;
 #endif
 };
 
-
-
 /* 0x71 service_identifier_descriptor (ETSI TS 102 812, MHP) */
 
 struct descr_service_identifier {
@@ -1625,7 +1512,6 @@ struct descr_service_identifier {
    u_char descriptor_length                      :8;
 };
 
-
 /* MHP 0x00 application_descriptor */
 
 #define DESCR_APPLICATION_LEN 3
@@ -1636,7 +1522,6 @@ struct descr_application {
    u_char application_profiles_length            :8;
 };
 
-
 #define DESCR_APPLICATION_END_LEN 2
 
 struct descr_application_end {
@@ -1653,18 +1538,16 @@ struct descr_application_end {
 /*now follow 8bit transport_protocol_label fields to the end */
 };
 
-
 #define APPLICATION_PROFILE_ENTRY_LEN 5
 
 struct application_profile_entry {
-   u_char application_profile_hi                 :8;   
-   u_char application_profile_lo                 :8;   
-   u_char version_major                          :8;   
-   u_char version_minor                          :8;   
-   u_char version_micro                          :8;   
+   u_char application_profile_hi                 :8;
+   u_char application_profile_lo                 :8;
+   u_char version_major                          :8;
+   u_char version_minor                          :8;
+   u_char version_micro                          :8;
 };
 
-
 /* MHP 0x01 application_name_desriptor */
 
 #define DESCR_APPLICATION_NAME_LEN 2
@@ -1674,7 +1557,6 @@ struct descr_application_name {
    u_char descriptor_length                      :8;
 };
 
-
 #define APPLICATION_NAME_ENTRY_LEN 4
 
 struct descr_application_name_entry {
@@ -1685,7 +1567,6 @@ struct descr_application_name_entry {
    /* application name string */
 };
 
-
 /* MHP 0x02 transport_protocol_descriptor */
 
 #define DESCR_TRANSPORT_PROTOCOL_LEN 5
@@ -1693,13 +1574,12 @@ struct descr_application_name_entry {
 struct descr_transport_protocol {
    u_char descriptor_tag                         :8;
    u_char descriptor_length                      :8;
-   u_char protocol_id_hi                         :8;   
-   u_char protocol_id_lo                         :8;   
-   u_char transport_protocol_label               :8; 
-   /* protocol_id-specific selector bytes follow */  
+   u_char protocol_id_hi                         :8;
+   u_char protocol_id_lo                         :8;
+   u_char transport_protocol_label               :8;
+   /* protocol_id-specific selector bytes follow */
 };
 
-
 #define TRANSPORT_VIA_OC_LEN 1
 
 struct transport_via_oc {
@@ -1712,7 +1592,6 @@ struct transport_via_oc {
 #endif
 };
 
-
 //if remote is true, transport_via_oc_remote_end_t follows,
 // else transport_via_oc_end_t.
 
@@ -1728,14 +1607,12 @@ struct transport_via_oc_remote_end {
    u_char component_tag                          :8;
 };
 
-
 #define TRANSPORT_VIA_OC_END_LEN 1
 
 struct transport_via_oc_end {
    u_char component_tag                          :8;
 };
 
-
 /* 0x03 dvb_j_application_descriptor() */
 
 #define DESCR_DVBJ_APPLICATION_LEN 2
@@ -1745,7 +1622,6 @@ struct descr_dvbj_application {
    u_char descriptor_length                      :8;
 };
 
-
 #define DESCR_DVBJ_APPLICATION_ENTRY_LEN 1
 
 struct descr_dvbj_application_entry {
@@ -1753,7 +1629,6 @@ struct descr_dvbj_application_entry {
    /* parameter string */
 };
 
-
 /* 0x04 dvb_j_application_location_descriptor */
 
 #define DESCR_DVBJ_APPLICATION_LOCATION_LEN 3
@@ -1765,14 +1640,12 @@ struct descr_dvbj_application_location {
    /* base directory string */
 };
 
-
 #define DESCR_DVBJ_APPLICATION_LOCATION_MID_LEN 1
 
 struct descr_dvbj_application_location_mid {
    u_char classpath_extension_length                  :8;
 };
 
-
 /* 0x0B application_icons_descriptor */
 
 #define DESCR_APPLICATION_ICONS_LEN 3
@@ -1782,21 +1655,15 @@ struct descr_application_icons_descriptor {
    u_char descriptor_length                      :8;
    u_char icon_locator_length                    :8;
    /* icon locator */
-}; 
-
+};
 
 #define DESCR_APPLICATION_ICONS_END_LEN 2
 
 struct descr_application_icons_descriptor_end {
    u_char icon_flags_hi                          :8;
    u_char icon_flags_lo                          :8;
-}; 
-
-
-
-
+};
 
 } //end of namespace
 
 #endif //LIBSI_HEADERS_H
-