add the DVBPSI_USE_DEPRECATED_DR_API define for exporting the old descriptor API

src/descriptors/atsc/dr_81.h

@@ -82,6 +82,14 @@ typedef struct dvbpsi_atsc_ac3_audio_dr_s
  */
 dvbpsi_atsc_ac3_audio_dr_t *dvbpsi_decode_atsc_ac3_audio_dr(dvbpsi_descriptor_t *p_descriptor);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_atsc_ac3_audio_dr_t dvbpsi_ac3_audio_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_ac3_audio_dr_t* dvbpsi_DecodeAc3AudioDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_atsc_ac3_audio_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/descriptors/atsc/dr_86.h

@@ -88,6 +88,14 @@ typedef struct dvbpsi_atsc_caption_service_dr_s
  */
 dvbpsi_atsc_caption_service_dr_t *dvbpsi_decode_atsc_caption_service_dr(dvbpsi_descriptor_t *p_descriptor);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_atsc_caption_service_dr_t dvbpsi_caption_service_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_caption_service_dr_t* dvbpsi_DecodeCaptionServiceDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_atsc_caption_service_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/descriptors/atsc/dr_a0.h

@@ -66,6 +66,14 @@ typedef struct dvbpsi_atsc_extended_channel_name_dr_s
  */
 dvbpsi_atsc_extended_channel_name_dr_t *dvbpsi_decode_atsc_extended_channel_name_dr(dvbpsi_descriptor_t *p_descriptor);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_atsc_extended_channel_name_dr_t dvbpsi_extended_channel_name_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_extended_channel_name_dr_t* dvbpsi_DecodeExtendedChannelNameDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_atsc_extended_channel_name_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/descriptors/atsc/dr_a1.h

@@ -110,6 +110,17 @@ dvbpsi_descriptor_t* dvbpsi_gen_atsc_service_location_dr(
                                         dvbpsi_atsc_service_location_dr_t* p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_atsc_service_location_dr_t dvbpsi_service_location_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_service_location_dr_t* dvbpsi_DecodeServiceLocationDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_atsc_service_location_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenServiceLocationDr (dvbpsi_service_location_dr_t* dr, bool dup) {
+    return dvbpsi_gen_atsc_service_location_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 }

src/descriptors/custom/dr_83_eacem.h

@@ -100,6 +100,18 @@ dvbpsi_eacem_lcn_dr_t *dvbpsi_decode_eacem_lcn_dr(dvbpsi_descriptor_t *p_descrip
  */
 dvbpsi_descriptor_t* dvbpsi_gen_eacem_lcn_dr(dvbpsi_eacem_lcn_dr_t* p_decoded, bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_eacem_lcn_dr_t dvbpsi_lcn_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_lcn_dr_t* dvbpsi_DecodeLCNDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_eacem_lcn_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenLCNDr (dvbpsi_lcn_dr_t* dr, bool dup) {
+    return dvbpsi_gen_eacem_lcn_dr (dr, dup);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/custom/dr_8a_scte.h

@@ -59,7 +59,7 @@ typedef struct dvbpsi_scte_cuei_dr_s
 
 
 /*****************************************************************************
- * dvbpsi_DecodeCUEIDataDr
+ * dvbpsi_decode_scte_cuei_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_scte_cuei_dr_t * dvbpsi_decode_scte_cuei_dr(dvbpsi_descriptor_t * p_descriptor)
@@ -72,7 +72,7 @@ dvbpsi_scte_cuei_dr_t* dvbpsi_decode_scte_cuei_dr(dvbpsi_descriptor_t * p_descri
 
 
 /*****************************************************************************
- * dvbpsi_GenCUEIDataDr
+ * dvbpsi_gen_scte_cuei_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_descriptor_t * dvbpsi_gen_scte_cuei_dr(
@@ -86,6 +86,17 @@ dvbpsi_scte_cuei_dr_t* dvbpsi_decode_scte_cuei_dr(dvbpsi_descriptor_t * p_descri
  */
 dvbpsi_descriptor_t * dvbpsi_gen_scte_cuei_dr(dvbpsi_scte_cuei_dr_t * p_decoded, bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_scte_cuei_dr_t dvbpsi_cuei_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_cuei_dr_t* dvbpsi_DecodeCUEIDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_scte_cuei_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenCUEIDr (dvbpsi_cuei_dr_t* dr, bool dup) {
+    return dvbpsi_gen_scte_cuei_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_40.h

@@ -95,6 +95,18 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_network_name_dr(
                                         dvbpsi_dvb_network_name_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_network_name_dr_t dvbpsi_network_name_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_network_name_dr_t* dvbpsi_DecodeNetworkNameDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_network_name_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenNetworkNameDr (dvbpsi_network_name_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_network_name_dr (dr, dup);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_41.h

@@ -95,6 +95,18 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_service_list_dr(
 		                        dvbpsi_dvb_service_list_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_service_list_dr_t dvbpsi_service_list_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenServiceListDr (dvbpsi_service_list_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_service_list_dr (dr, dup);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_service_list_dr_t* dvbpsi_DecodeServiceListDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_service_list_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_42.h

@@ -96,6 +96,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_stuffing_dr(
                                         dvbpsi_dvb_stuffing_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_stuffing_dr_t dvbpsi_stuffing_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_stuffing_dr_t* dvbpsi_DecodeStuffingDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_stuffing_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenStuffingDr (dvbpsi_stuffing_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_stuffing_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_43.h

@@ -101,6 +101,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_sat_deliv_sys_dr(
                                         dvbpsi_dvb_sat_deliv_sys_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_sat_deliv_sys_dr_t dvbpsi_sat_deliv_sys_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_sat_deliv_sys_dr_t* dvbpsi_DecodeSatDelivSysDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_sat_deliv_sys_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenSatDelivSysDr (dvbpsi_sat_deliv_sys_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_sat_deliv_sys_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_44.h

@@ -98,6 +98,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_cable_deliv_sys_dr(
                                         dvbpsi_dvb_cable_deliv_sys_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_cable_deliv_sys_dr_t dvbpsi_cable_deliv_sys_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_cable_deliv_sys_dr_t* dvbpsi_DecodeCableDelivSysDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_cable_deliv_sys_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenCableDelivSysDr (dvbpsi_cable_deliv_sys_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_cable_deliv_sys_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_45.h

@@ -151,6 +151,18 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_vbi_dr(
                                         dvbpsi_dvb_vbi_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_vbi_dr_t dvbpsi_vbi_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_vbi_dr_t* dvbpsi_DecodeVBIDataDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_vbi_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenVBIDataDr (dvbpsi_vbi_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_vbi_dr (dr, dup);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_47.h

@@ -95,6 +95,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_bouquet_name_dr(
                                         dvbpsi_dvb_bouquet_name_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_bouquet_name_dr_t dvbpsi_bouquet_name_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_bouquet_name_dr_t* dvbpsi_DecodeBouquetNameDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_bouquet_name_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenBouquetNameDr (dvbpsi_bouquet_name_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_bouquet_name_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_48.h

@@ -69,7 +69,7 @@ typedef struct dvbpsi_dvb_service_dr_s
 
 
 /*****************************************************************************
- * dvbpsi_DecodeServiceDataDr
+ * dvbpsi_decode_dvb_service_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_dvb_service_dr_t * dvbpsi_decode_dvb_service_dr(
@@ -84,7 +84,7 @@ dvbpsi_dvb_service_dr_t* dvbpsi_decode_dvb_service_dr(
 
 
 /*****************************************************************************
- * dvbpsi_GenServiceDataDr
+ * dvbpsi_gen_dvb_service_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_descriptor_t * dvbpsi_gen_dvb_service_dr(
@@ -100,6 +100,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_service_dr(
                                         dvbpsi_dvb_service_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_service_dr_t dvbpsi_service_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_service_dr_t* dvbpsi_DecodeServiceDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_service_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenServiceDr (dvbpsi_service_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_service_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_49.h

@@ -100,6 +100,18 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_country_availability_dr(
 		                        dvbpsi_dvb_country_availability_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_country_availability_dr_t dvbpsi_country_availability_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_country_availability_dr_t* dvbpsi_DecodeCountryAvailabilityDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_country_availability_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenCountryAvailabilityDr (dvbpsi_country_availability_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_country_availability_dr (dr, dup);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_4a.h

@@ -112,6 +112,18 @@ dvbpsi_dvb_linkage_dr_t* dvbpsi_decode_dvb_linkage_dr(dvbpsi_descriptor_t * p_de
 dvbpsi_descriptor_t *dvbpsi_gen_dvb_linkage_dr(dvbpsi_dvb_linkage_dr_t * p_decoded,
                                          bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_linkage_dr_t dvbpsi_linkage_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_linkage_dr_t* dvbpsi_DecodeLinkageDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_linkage_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenLinkageDr (dvbpsi_linkage_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_linkage_dr (dr, dup);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_4b.h

@@ -110,6 +110,19 @@ dvbpsi_dvb_nvod_ref_dr_t* dvbpsi_decode_dvb_nvod_ref_dr(dvbpsi_descriptor_t * p_
 dvbpsi_descriptor_t *dvbpsi_gen_dvb_nvod_ref_dr(dvbpsi_dvb_nvod_ref_dr_t * p_decoded,
                                          bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_nvod_ref_dr_t dvbpsi_nvod_ref_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_nvod_ref_dr_t* dvbpsi_DecodeNVODReferenceDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_nvod_ref_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenNVODReferenceDr (dvbpsi_nvod_ref_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_nvod_ref_dr (dr, dup);
+}
+
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_4c.h

@@ -89,6 +89,18 @@ dvbpsi_dvb_tshifted_service_dr_t* dvbpsi_decode_dvb_tshifted_service_dr(dvbpsi_d
 dvbpsi_descriptor_t *dvbpsi_gen_dvb_tshifted_service_dr(dvbpsi_dvb_tshifted_service_dr_t *p_decoded,
                                                     bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_tshifted_service_dr_t dvbpsi_tshifted_service_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_tshifted_service_dr_t* dvbpsi_DecodeTimeShiftedServiceDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_tshifted_service_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenTimeShiftedServiceDr (dvbpsi_tshifted_service_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_tshifted_service_dr (dr, dup);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_4d.h

@@ -93,6 +93,17 @@ dvbpsi_dvb_short_event_dr_t* dvbpsi_decode_dvb_short_event_dr(dvbpsi_descriptor_
 dvbpsi_descriptor_t * dvbpsi_gen_dvb_short_event_dr(dvbpsi_dvb_short_event_dr_t * p_decoded,
                                              bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_short_event_dr_t dvbpsi_short_event_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_short_event_dr_t* dvbpsi_DecodeShortEventDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_short_event_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenShortEventDr (dvbpsi_short_event_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_short_event_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_4e.h

@@ -102,6 +102,17 @@ dvbpsi_dvb_extended_event_dr_t* dvbpsi_decode_dvb_extended_event_dr(dvbpsi_descr
 dvbpsi_descriptor_t * dvbpsi_gen_dvb_extended_event_dr(dvbpsi_dvb_extended_event_dr_t * p_decoded,
                                                 bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_extended_event_dr_t dvbpsi_extended_event_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_extended_event_dr_t* dvbpsi_DecodeExtendedEventDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_extended_event_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenExtendedEventDr (dvbpsi_extended_event_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_extended_event_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_4f.h

@@ -90,6 +90,18 @@ dvbpsi_dvb_tshifted_ev_dr_t* dvbpsi_decode_dvb_tshifted_ev_dr(dvbpsi_descriptor_
 dvbpsi_descriptor_t *dvbpsi_gen_dvb_tshifted_ev_dr(dvbpsi_dvb_tshifted_ev_dr_t * p_decoded,
                                                   bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_tshifted_ev_dr_t dvbpsi_tshifted_ev_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_tshifted_ev_dr_t* dvbpsi_DecodeTimeShiftedEventDr(dvbpsi_descriptor_t* dr) {
+    return dvbpsi_decode_dvb_tshifted_ev_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenTimeShiftedEventDr (dvbpsi_tshifted_ev_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_tshifted_ev_dr (dr, dup);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_50.h

@@ -95,6 +95,18 @@ dvbpsi_dvb_component_dr_t* dvbpsi_decode_dvb_component_dr(dvbpsi_descriptor_t *
 dvbpsi_descriptor_t *dvbpsi_gen_dvb_component_dr(dvbpsi_dvb_component_dr_t * p_decoded,
                                                   bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_component_dr_t dvbpsi_component_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_component_dr_t* dvbpsi_DecodeComponentDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_component_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenComponentDr (dvbpsi_component_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_component_dr (dr, dup);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_52.h

@@ -91,6 +91,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_stream_identifier_dr(
                                         dvbpsi_dvb_stream_identifier_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_stream_identifier_dr_t dvbpsi_stream_identifier_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_stream_identifier_dr_t* dvbpsi_DecodeStreamIdentifierDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_stream_identifier_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenStreamIdentifierDr (dvbpsi_stream_identifier_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_stream_identifier_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_53.h

@@ -92,7 +92,7 @@ typedef struct dvbpsi_dvb_ca_identifier_dr_s
 /*!
  * \fn dvbpsi_da_identifier_dr_t * dvbpsi_decode_dvb_ca_identifier_dr(
                                         dvbpsi_descriptor_t *p_descriptor)
- * \brief "DA identifier" descriptor decoder.
+ * \brief "CA identifier" descriptor decoder.
  * \param p_descriptor pointer to the descriptor structure
  * \return a pointer to a new "CA identifier" descriptor structure
  * which contains the decoded data.
@@ -116,6 +116,17 @@ dvbpsi_dvb_ca_identifier_dr_t* dvbpsi_decode_dvb_ca_identifier_dr(dvbpsi_descrip
 dvbpsi_descriptor_t *dvbpsi_gen_dvb_ca_identifier_dr(dvbpsi_dvb_ca_identifier_dr_t *p_decoded,
                                               bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_ca_identifier_dr_t dvbpsi_ca_identifier_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_ca_identifier_dr_t* dvbpsi_DecodeCAIdentifierDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_ca_identifier_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenCAIdentifierDr (dvbpsi_ca_identifier_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_ca_identifier_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_54.h

@@ -221,7 +221,7 @@ typedef struct dvbpsi_dvb_content_dr_s
 
 
 /*****************************************************************************
- * dvbpsi_DecodeContentDataDr
+ * dvbpsi_decode_dvb_content_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_dvb_content_dr_t * dvbpsi_decode_dvb_content_dr(
@@ -236,7 +236,7 @@ dvbpsi_dvb_content_dr_t* dvbpsi_decode_dvb_content_dr(
 
 
 /*****************************************************************************
- * dvbpsi_GenContentDataDr
+ * dvbpsi_gen_dvb_content_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_descriptor_t * dvbpsi_gen_dvb_content_dr(
@@ -252,6 +252,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_content_dr(
                                         dvbpsi_dvb_content_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_content_dr_t dvbpsi_content_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_content_dr_t* dvbpsi_DecodeContentDr (dvbpsi_descriptor_t* dr) {
+    return dvbpsi_decode_dvb_content_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenContentDr (dvbpsi_content_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_content_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_55.h

@@ -89,7 +89,7 @@ typedef struct dvbpsi_dvb_parental_rating_dr_s
 
 
 /*****************************************************************************
- * dvbpsi_DecodeParentalRatingDataDr
+ * dvbpsi_decode_dvb_parental_rating_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_dvb_parental_rating_dr_t * dvbpsi_decode_dvb_parental_rating_dr(
@@ -104,7 +104,7 @@ dvbpsi_dvb_parental_rating_dr_t* dvbpsi_decode_dvb_parental_rating_dr(
 
 
 /*****************************************************************************
- * dvbpsi_GenParentalRatingDataDr
+ * dvbpsi_gen_dvb_parental_rating_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_descriptor_t * dvbpsi_gen_dvb_parental_rating_dr(
@@ -120,6 +120,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_parental_rating_dr(
                                         dvbpsi_dvb_parental_rating_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_parental_rating_dr_t dvbpsi_parental_rating_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_parental_rating_dr_t* dvbpsi_DecodeParentalRatingDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_parental_rating_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenParentalRatingDr (dvbpsi_parental_rating_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_parental_rating_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_56.h

@@ -91,7 +91,7 @@ typedef struct dvbpsi_dvb_teletext_dr_s
 } dvbpsi_dvb_teletext_dr_t;
 
 /*****************************************************************************
- * dvbpsi_DecodeTeletextDataDr
+ * dvbpsi_decode_dvb_teletext_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_dvb_teletext_dr_t * dvbpsi_decode_dvb_teletext_dr(
@@ -122,6 +122,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_teletext_dr(
                                         dvbpsi_dvb_teletext_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_teletext_dr_t dvbpsi_teletext_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_teletext_dr_t* dvbpsi_DecodeTeletextDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_teletext_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenTeletextDr (dvbpsi_teletext_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_teletext_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_58.h

@@ -126,6 +126,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_local_time_offset_dr(
                                         dvbpsi_dvb_local_time_offset_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_local_time_offset_dr_t dvbpsi_local_time_offset_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_local_time_offset_dr_t* dvbpsi_DecodeLocalTimeOffsetDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_local_time_offset_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenLocalTimeOffsetDr (dvbpsi_local_time_offset_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_local_time_offset_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_59.h

@@ -91,7 +91,7 @@ typedef struct dvbpsi_dvb_subtitling_dr_s
 
 
 /*****************************************************************************
- * dvbpsi_DecodeSubtitlingDataDr
+ * dvbpsi_decode_dvb_subtitling_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_dvb_subtitling_dr_t * dvbpsi_decode_dvb_subtitling_dr(
@@ -106,7 +106,7 @@ dvbpsi_dvb_subtitling_dr_t* dvbpsi_decode_dvb_subtitling_dr(
 
 
 /*****************************************************************************
- * dvbpsi_GenSubtitlingDataDr
+ * dvbpsi_gen_dvb_subtitling_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_descriptor_t * dvbpsi_gen_dvb_subtitling_dr(
@@ -122,6 +122,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_subtitling_dr(
                                         dvbpsi_dvb_subtitling_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_subtitling_dr_t dvbpsi_subtitling_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_subtitling_dr_t* dvbpsi_DecodeSubtitlingDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_subtitling_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenSubtitlingDr (dvbpsi_subtitling_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_subtitling_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_5a.h

@@ -104,6 +104,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_dvb_terr_deliv_sys_dr(
                                         dvbpsi_dvb_terr_deliv_sys_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_terr_deliv_sys_dr_t dvbpsi_terr_deliv_sys_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_terr_deliv_sys_dr_t* dvbpsi_DecodeTerrDelivSysDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_terr_deliv_sys_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenTerrDelivSysDr (dvbpsi_terr_deliv_sys_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_terr_deliv_sys_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_62.h

@@ -78,6 +78,14 @@ dvbpsi_dvb_frequency_list_dr_t *dvbpsi_decode_dvb_frequency_list_dr(dvbpsi_descr
  */
 uint32_t dvbpsi_Bcd8ToUint32(uint32_t bcd);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_frequency_list_dr_t dvbpsi_frequency_list_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_frequency_list_dr_t* dvbpsi_DecodeFrequencyListDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_frequency_list_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_66.h

@@ -65,4 +65,12 @@ typedef struct dvbpsi_dvb_data_broadcast_id_dr_s
  */
 dvbpsi_dvb_data_broadcast_id_dr_t *dvbpsi_decode_dvb_data_broadcast_id_dr(dvbpsi_descriptor_t *p_descriptor);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_data_broadcast_id_dr_t dvbpsi_data_broadcast_id_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_data_broadcast_id_dr_t* dvbpsi_DecodeDataBroadcastIdDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_data_broadcast_id_dr (dr);
+}
+#endif
+
 #endif

src/descriptors/dvb/dr_69.h

@@ -89,6 +89,17 @@ dvbpsi_dvb_PDC_dr_t* dvbpsi_decode_dvb_PDC_dr(dvbpsi_descriptor_t * p_descriptor
 dvbpsi_descriptor_t * dvbpsi_gen_dvb_PDC_dr(dvbpsi_dvb_PDC_dr_t * p_decoded,
                                       bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_PDC_dr_t dvbpsi_PDC_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_PDC_dr_t* dvbpsi_DecodePDCDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_PDC_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenPDCDr (dvbpsi_PDC_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_PDC_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/dvb/dr_73.h

@@ -53,7 +53,7 @@ typedef struct dvbpsi_dvb_default_authority_dr_s
 } dvbpsi_dvb_default_authority_dr_t;
 
 /*****************************************************************************
- * dvbpsi_decode_eacem_lcn_dr
+ * dvbpsi_decode_dvb_default_authority_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_dvb_default_authority_dr_t *dvbpsi_decode_dvb_default_authority_dr(dvbpsi_descriptor_t *p_descriptor)
@@ -64,6 +64,14 @@ typedef struct dvbpsi_dvb_default_authority_dr_s
  */
 dvbpsi_dvb_default_authority_dr_t *dvbpsi_decode_dvb_default_authority_dr(dvbpsi_descriptor_t *p_descriptor);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_default_authority_dr_t dvbpsi_default_authority_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_default_authority_dr_t* dvbpsi_DecodeDefaultAuthorityDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_default_authority_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_76.h

@@ -113,7 +113,7 @@ typedef struct dvbpsi_dvb_content_id_dr_s
 } dvbpsi_dvb_content_id_dr_t;
 
 /*****************************************************************************
- * dvbpsi_decode_eacem_lcn_dr
+ * dvbpsi_decode_dvb_content_id_dr
  *****************************************************************************/
 /*!
  * \fn dvbpsi_dvb_content_id_dr_s dvbpsi_decode_dvb_content_id_dr(dvbpsi_descriptor_t *p_descriptor)
@@ -124,6 +124,14 @@ typedef struct dvbpsi_dvb_content_id_dr_s
  */
 dvbpsi_dvb_content_id_dr_t *dvbpsi_decode_dvb_content_id_dr(dvbpsi_descriptor_t *p_descriptor);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_content_id_dr_t dvbpsi_content_id_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_content_id_dr_t* dvbpsi_DecodeContentIdDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_content_id_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/dvb/dr_7c.h

@@ -136,6 +136,18 @@ dvbpsi_dvb_aac_dr_t* dvbpsi_decode_dvb_aac_dr(dvbpsi_descriptor_t *p_descriptor)
  */
 dvbpsi_descriptor_t *dvbpsi_gen_dvb_aac_dr(dvbpsi_dvb_aac_dr_t *p_decoded, bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_dvb_aac_dr_t dvbpsi_aac_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_aac_dr_t* dvbpsi_DecodeAACDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_dvb_aac_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenAACDr (dvbpsi_aac_dr_t* dr, bool dup) {
+    return dvbpsi_gen_dvb_aac_dr (dr, dup);
+}
+#endif
+
 #ifdef __cplusplus
 };
 #endif

src/descriptors/mpeg/dr_02.h

@@ -99,6 +99,17 @@ dvbpsi_mpeg_vstream_dr_t* dvbpsi_decode_mpeg_vstream_dr(dvbpsi_descriptor_t * p_
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_vstream_dr(dvbpsi_mpeg_vstream_dr_t * p_decoded,
                                           bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_vstream_dr_t dvbpsi_vstream_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_vstream_dr_t* dvbpsi_DecodeVStreamDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_vstream_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenVStreamDr (dvbpsi_vstream_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_vstream_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_03.h

@@ -93,6 +93,17 @@ dvbpsi_mpeg_astream_dr_t* dvbpsi_decode_mpeg_astream_dr(dvbpsi_descriptor_t * p_
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_astream_dr(dvbpsi_mpeg_astream_dr_t * p_decoded,
                                           bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_astream_dr_t dvbpsi_astream_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_astream_dr_t* dvbpsi_DecodeAStreamDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_astream_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenAStreamDr (dvbpsi_astream_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_astream_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_04.h

@@ -94,6 +94,17 @@ dvbpsi_mpeg_hierarchy_dr_t* dvbpsi_decode_mpeg_hierarchy_dr(
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_hierarchy_dr(dvbpsi_mpeg_hierarchy_dr_t * p_decoded,
                                             bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_hierarchy_dr_t dvbpsi_hierarchy_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenHierarchyDr (dvbpsi_hierarchy_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_hierarchy_dr (dr, dup);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_hierarchy_dr_t* dvbpsi_DecodeHierarchyDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_hierarchy_dr (dr);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_05.h

@@ -95,6 +95,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_mpeg_registration_dr(
                                         dvbpsi_mpeg_registration_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_registration_dr_t dvbpsi_registration_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_registration_dr_t* dvbpsi_DecodeRegistrationDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_registration_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenRegistrationDr (dvbpsi_registration_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_registration_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_06.h

@@ -93,6 +93,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_mpeg_ds_alignment_dr(
                                         dvbpsi_mpeg_ds_alignment_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_ds_alignment_dr_t dvbpsi_ds_alignment_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_ds_alignment_dr_t* dvbpsi_DecodeDSAlignmentDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_ds_alignment_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenDSAlignmentDr (dvbpsi_ds_alignment_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_ds_alignment_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_07.h

@@ -95,6 +95,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_mpeg_target_bg_grid_dr(
                                         dvbpsi_mpeg_target_bg_grid_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_target_bg_grid_dr_t dvbpsi_target_bg_grid_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_target_bg_grid_dr_t* dvbpsi_DecodeTargetBgGridDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_target_bg_grid_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenTargetBgGridDr (dvbpsi_target_bg_grid_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_target_bg_grid_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_08.h

@@ -92,6 +92,17 @@ dvbpsi_mpeg_vwindow_dr_t* dvbpsi_decode_mpeg_vwindow_dr(dvbpsi_descriptor_t * p_
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_vwindow_dr(dvbpsi_mpeg_vwindow_dr_t * p_decoded,
                                           bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_vwindow_dr_t dvbpsi_vwindow_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenVWindowDr (dvbpsi_vwindow_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_vwindow_dr (dr, dup);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_vwindow_dr_t* dvbpsi_DecodeVWindowDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_vwindow_dr (dr);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_09.h

@@ -95,6 +95,17 @@ dvbpsi_mpeg_ca_dr_t* dvbpsi_decode_mpeg_ca_dr(dvbpsi_descriptor_t * p_descriptor
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_ca_dr(dvbpsi_mpeg_ca_dr_t * p_decoded,
                                      bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_ca_dr_t dvbpsi_ca_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_ca_dr_t* dvbpsi_DecodeCADr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_ca_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenCADr (dvbpsi_ca_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_ca_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_0a.h

@@ -97,6 +97,17 @@ dvbpsi_mpeg_iso639_dr_t* dvbpsi_decode_mpeg_iso639_dr(dvbpsi_descriptor_t * p_de
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_iso639_dr(dvbpsi_mpeg_iso639_dr_t * p_decoded,
                                          bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_iso639_dr_t dvbpsi_iso639_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_iso639_dr_t* dvbpsi_DecodeISO639Dr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_iso639_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenISO639Dr (dvbpsi_iso639_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_iso639_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_0b.h

@@ -96,6 +96,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_mpeg_system_clock_dr(
                                         dvbpsi_mpeg_system_clock_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_system_clock_dr_t dvbpsi_system_clock_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_system_clock_dr_t* dvbpsi_DecodeSystemClockDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_system_clock_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenSystemClockDr (dvbpsi_system_clock_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_system_clock_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_0c.h

@@ -95,6 +95,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_mpeg_mx_buff_utilization_dr(
                                 dvbpsi_mpeg_mx_buff_utilization_dr_t * p_decoded,
                                 bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_mx_buff_utilization_dr_t dvbpsi_mx_buff_utilization_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_mx_buff_utilization_dr_t* dvbpsi_DecodeMxBuffUtilizationDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_mx_buff_utilization_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenMxBuffUtilizationDr (dvbpsi_mx_buff_utilization_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_mx_buff_utilization_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_0d.h

@@ -95,6 +95,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_mpeg_copyright_dr(
                                         dvbpsi_mpeg_copyright_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_copyright_dr_t dvbpsi_copyright_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_copyright_dr_t* dvbpsi_DecodeCopyrightDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_copyright_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenCopyrightDr (dvbpsi_copyright_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_copyright_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_0e.h

@@ -92,6 +92,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_mpeg_max_bitrate_dr(
                                         dvbpsi_mpeg_max_bitrate_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_max_bitrate_dr_t dvbpsi_max_bitrate_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenMaxBitrateDr (dvbpsi_max_bitrate_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_max_bitrate_dr (dr, dup);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_max_bitrate_dr_t* dvbpsi_DecodeMaxBitrateDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_max_bitrate_dr (dr);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_0f.h

@@ -93,6 +93,17 @@ dvbpsi_descriptor_t * dvbpsi_gen_mpeg_private_data_dr(
                                         dvbpsi_mpeg_private_data_dr_t * p_decoded,
                                         bool b_duplicate);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_private_data_dr_t dvbpsi_private_data_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_private_data_dr_t* dvbpsi_DecodePrivateDataDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_private_data_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenPrivateDataDr (dvbpsi_private_data_dr_t* dr, bool dup) {
+    return dvbpsi_gen_mpeg_private_data_dr (dr, dup);
+}
+#endif
 
 #ifdef __cplusplus
 };

src/descriptors/mpeg/dr_10.h

@@ -72,6 +72,18 @@ dvbpsi_mpeg_smoothing_buffer_dr_t* dvbpsi_decode_mpeg_smoothing_buffer_dr(
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_smoothing_buffer_dr(
                                       dvbpsi_mpeg_smoothing_buffer_dr_t * p_decoded);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_smoothing_buffer_dr_t dvbpsi_smoothing_buffer_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_smoothing_buffer_dr_t* dvbpsi_DecodeSmoothingBufferDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_smoothing_buffer_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenSmoothingBufferDr (dvbpsi_smoothing_buffer_dr_t* dr) {
+    return dvbpsi_gen_mpeg_smoothing_buffer_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/descriptors/mpeg/dr_11.h

@@ -66,6 +66,18 @@ dvbpsi_mpeg_std_dr_t* dvbpsi_decode_mpeg_std_dr(dvbpsi_descriptor_t * p_descript
  */
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_std_dr(dvbpsi_mpeg_std_dr_t * p_decoded);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_std_dr_t dvbpsi_std_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_std_dr_t* dvbpsi_DecodeSTDDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_std_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenSTDDr (dvbpsi_std_dr_t* dr) {
+    return dvbpsi_gen_mpeg_std_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/descriptors/mpeg/dr_12.h

@@ -68,6 +68,18 @@ dvbpsi_mpeg_ibp_dr_t* dvbpsi_decode_mpeg_ibp_dr(dvbpsi_descriptor_t * p_descript
  */
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_ibp_dr(dvbpsi_mpeg_ibp_dr_t * p_decoded);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_ibp_dr_t dvbpsi_ibp_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_ibp_dr_t* dvbpsi_DecodeIBPDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_ibp_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenIBPDr (dvbpsi_ibp_dr_t* dr) {
+    return dvbpsi_gen_mpeg_ibp_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/descriptors/mpeg/dr_13.h

@@ -65,4 +65,12 @@ typedef struct dvbpsi_mpeg_carousel_id_dr_s
  */
 dvbpsi_mpeg_carousel_id_dr_t *dvbpsi_decode_mpeg_carousel_id_dr(dvbpsi_descriptor_t *p_descriptor);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_carousel_id_dr_t dvbpsi_carousel_id_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_carousel_id_dr_t* dvbpsi_DecodeCarouselIdDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_carousel_id_dr (dr);
+}
+#endif
+
 #endif

src/descriptors/mpeg/dr_14.h

@@ -70,4 +70,12 @@ typedef struct dvbpsi_mpeg_association_tag_dr_s
  */
 dvbpsi_mpeg_association_tag_dr_t *dvbpsi_decode_mpeg_association_tag_dr(dvbpsi_descriptor_t *p_descriptor);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_association_tag_dr_t dvbpsi_association_tag_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_association_tag_dr_t* dvbpsi_DecodeAssociationTagDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_association_tag_dr (dr);
+}
+#endif
+
 #endif

src/descriptors/mpeg/dr_1b.h

@@ -136,6 +136,18 @@ dvbpsi_mpeg_mpeg4_video_dr_t* dvbpsi_decode_mpeg_mpeg4_video_dr(
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_mpeg4_video_dr(
                                       dvbpsi_mpeg_mpeg4_video_dr_t * p_decoded);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_mpeg4_video_dr_t dvbpsi_mpeg4_video_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_mpeg4_video_dr_t* dvbpsi_DecodeMPEG4VideoDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_mpeg4_video_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenMPEG4VideoDr (dvbpsi_mpeg4_video_dr_t* dr) {
+    return dvbpsi_gen_mpeg_mpeg4_video_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/descriptors/mpeg/dr_1c.h

@@ -71,6 +71,18 @@ dvbpsi_mpeg_mpeg4_audio_dr_t* dvbpsi_decode_mpeg_mpeg4_audio_dr(
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_mpeg4_audio_dr(
                                       dvbpsi_mpeg_mpeg4_audio_dr_t * p_decoded);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_mpeg4_audio_dr_t dvbpsi_mpeg4_audio_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_mpeg4_audio_dr_t* dvbpsi_DecodeMPEG4AudioDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_mpeg4_audio_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenMPEG4AudioDr (dvbpsi_mpeg4_audio_dr_t* dr) {
+    return dvbpsi_gen_mpeg_mpeg4_audio_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

src/descriptors/mpeg/dr_24.h

@@ -121,6 +121,18 @@ dvbpsi_mpeg_content_labelling_dr_t* dvbpsi_decode_mpeg_content_labelling_dr(
 dvbpsi_descriptor_t * dvbpsi_gen_mpeg_content_labelling_dr(
                                       dvbpsi_mpeg_content_labelling_dr_t * p_decoded);
 
+#ifdef DVBPSI_USE_DEPRECATED_DR_API
+typedef dvbpsi_mpeg_content_labelling_dr_t dvbpsi_content_labelling_dr_t ;
+
+__attribute__((deprecated,unused)) static dvbpsi_content_labelling_dr_t* dvbpsi_DecodeContentLabellingDr (dvbpsi_descriptor_t *dr) {
+    return dvbpsi_decode_mpeg_content_labelling_dr (dr);
+}
+
+__attribute__((deprecated,unused)) static dvbpsi_descriptor_t* dvbpsi_GenContentLabellingDr (dvbpsi_content_labelling_dr_t* dr) {
+    return dvbpsi_gen_mpeg_content_labelling_dr (dr);
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif