Implemented the TerrestrialDeliverySystemDescriptor in libdtv1.1.31

1 files changed, 40 insertions, 4 deletions

diff --git a/libdtv/libsi/include/libsi.h b/libdtv/libsi/include/libsi.h
index a5e587b2..fca96ba7 100644
--- a/libdtv/libsi/include/libsi.h
+++ b/libdtv/libsi/include/libsi.h
@@ -1037,18 +1037,20 @@ struct SatelliteDeliverySystemDescriptor {
    unsigned short       Tag;
    long                 Frequency;
    short                OrbitalPosition;
+   short                Modulation;
    char                 Polarization;
    long                 SymbolRate;
    char                 FEC;
 };
 
-#define CreateSatelliteDeliverySystemDescriptor(descr, freq, orb, polar, sr, fec) \
+#define CreateSatelliteDeliverySystemDescriptor(descr, freq, orb, mod, polar, sr, fec) \
    do \
    { \
       xCreateNode (((struct SatelliteDeliverySystemDescriptor *)descr), NULL); \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->Tag = DESCR_SAT_DEL_SYS; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->Frequency = freq; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->OrbitalPosition = orb; \
+      ((struct SatelliteDeliverySystemDescriptor *)descr)->Modulation = mod; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->Polarization = polar; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->SymbolRate = sr; \
       ((struct SatelliteDeliverySystemDescriptor *)descr)->FEC = fec; \
@@ -1061,21 +1063,55 @@ struct CableDeliverySystemDescriptor {
    unsigned short       Tag;
    long                 Frequency;
    long                 SymbolRate;
-   char                 FEC;
+   char                 FECouter;
+   char                 FECinner;
    char                 Modulation;
 };
 
-#define CreateCableDeliverySystemDescriptor(descr, freq, sr, fec, mod) \
+#define CreateCableDeliverySystemDescriptor(descr, freq, sr, fec_o, fec_i, mod) \
    do \
    { \
       xCreateNode (((struct CableDeliverySystemDescriptor *)descr), NULL); \
       ((struct CableDeliverySystemDescriptor *)descr)->Tag = DESCR_CABLE_DEL_SYS; \
       ((struct CableDeliverySystemDescriptor *)descr)->Frequency = freq; \
       ((struct CableDeliverySystemDescriptor *)descr)->SymbolRate = sr; \
-      ((struct CableDeliverySystemDescriptor *)descr)->FEC = fec; \
+      ((struct CableDeliverySystemDescriptor *)descr)->FECouter = fec_o; \
+      ((struct CableDeliverySystemDescriptor *)descr)->FECinner = fec_i; \
       ((struct CableDeliverySystemDescriptor *)descr)->Modulation = mod; \
    } while (0)
 
+/* TerrestrialDeliverySystemDescriptor */
+
+struct TerrestrialDeliverySystemDescriptor {
+   struct NODE          Node;
+   unsigned short       Tag;
+   long                 Frequency;
+   char                 Bandwidth;
+   char                 Constellation;
+   char                 Hierarchy;
+   char                 CodeRateHP;
+   char                 CodeRateLP;
+   char                 GuardInterval;
+   char                 TransmissionMode;
+   char                 OtherFrequencyFlag;
+};
+
+#define CreateTerrestrialDeliverySystemDescriptor(descr, freq, bw, cst, hr, crh, crl, gi, tm, ofm) \
+   do \
+   { \
+      xCreateNode (((struct CableDeliverySystemDescriptor *)descr), NULL); \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Tag = DESCR_TERR_DEL_SYS; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Frequency = freq; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Bandwidth = bw; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Constellation = cst; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->Hierarchy = hr; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->CodeRateHP = crh; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->CodeRateLP = crl; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->GuardInterval = gi; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->TransmissionMode = tm; \
+      ((struct TerrestrialDeliverySystemDescriptor *)descr)->OtherFrequencyFlag = ofm; \
+   } while (0)
+
 /* ServiceListDescriptor */
 
 struct ServiceListDescriptor {