Demux: rename pf_callback to pf_gather

Renaming pf_callback to pf_gather to reflect its usage. It also
removes a typedef which was only used inside src/demux.c

src/demux.c

@@ -107,7 +107,6 @@ void dvbpsi_Demux(dvbpsi_t *p_dvbpsi, dvbpsi_psi_section_t *p_section)
     dvbpsi_demux_t * p_demux = (dvbpsi_demux_t *)p_dvbpsi->p_private;
     dvbpsi_demux_subdec_t * p_subdec = dvbpsi_demuxGetSubDec(p_demux, p_section->i_table_id,
                                                              p_section->i_extension);
-
     if (p_subdec == NULL)
     {
         /* Tell the application we found a new subtable, so that it may attach a
@@ -121,13 +120,9 @@ void dvbpsi_Demux(dvbpsi_t *p_dvbpsi, dvbpsi_psi_section_t *p_section)
     }
 
     if (p_subdec)
-    {
-        p_subdec->pf_callback(p_dvbpsi, p_subdec->p_cb_data, p_section);
-    }
+        p_subdec->pf_gather(p_dvbpsi, p_subdec->p_cb_data, p_section);
     else
-    {
         dvbpsi_DeletePSISections(p_section);
-    }
 }
 
 /*****************************************************************************

src/demux.h

@@ -53,21 +53,6 @@ typedef void (*dvbpsi_demux_new_cb_t) (void *   p_cb_data,
                                        uint8_t  i_table_id,
                                        uint16_t i_extension);
 
-/*****************************************************************************
- * dvbpsi_demux_subdec_cb_t
- *****************************************************************************/
-/*!
- * \typedef void (*dvbpsi_demux_subdec_cb_t)
-                    (dvbpsi_t             *p_dvbpsi,
-                     void                 *p_private_decoder,
-                     dvbpsi_psi_section_t *p_section);
- * \brief Subtable specific decoder.
- */
-typedef void (*dvbpsi_demux_subdec_cb_t)
-                     (dvbpsi_t             *p_dvbpsi,
-                      void                 *p_private_decoder,
-                      dvbpsi_psi_section_t *p_section);
-
 /*****************************************************************************
  * dvbpsi_demux_subdec_t
  *****************************************************************************/
@@ -86,12 +71,13 @@ struct dvbpsi_demux_s;
 typedef struct dvbpsi_demux_subdec_s
 {
   uint32_t                        i_id;             /*!< subtable id */
-  dvbpsi_demux_subdec_cb_t        pf_callback;      /*!< subdec callback */
+
+  void (*pf_gather)(dvbpsi_t *, void *, dvbpsi_psi_section_t *); /*!< gather subdec callback */
   void *                          p_cb_data;        /*!< subdec callback data */
-  struct dvbpsi_demux_subdec_s *  p_next;           /*!< next subdec */
 
   void (*pf_detach)(dvbpsi_t *, uint8_t, uint16_t); /*!< detach subdec callback */
 
+  struct dvbpsi_demux_subdec_s *  p_next;           /*!< next subdec */
 } dvbpsi_demux_subdec_t;
 
 /*****************************************************************************

src/tables/atsc_eit.c

@@ -115,7 +115,7 @@ bool dvbpsi_atsc_AttachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id, uint16_t i_ex
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_atsc_GatherEITSections;
+    p_subdec->pf_gather = &dvbpsi_atsc_GatherEITSections;
     p_subdec->p_cb_data = p_eit_decoder;
     p_subdec->i_id = ((uint32_t)i_table_id << 16) | i_extension;
     p_subdec->pf_detach = dvbpsi_atsc_DetachEIT;

src/tables/atsc_ett.c

@@ -122,7 +122,7 @@ bool dvbpsi_atsc_AttachETT(dvbpsi_t * p_dvbpsi, uint8_t i_table_id, uint16_t i_e
     }
 
     /* PSI decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_atsc_GatherETTSections;
+    p_subdec->pf_gather = &dvbpsi_atsc_GatherETTSections;
     p_subdec->p_cb_data = p_ett_decoder;
     p_subdec->i_id = ((uint32_t)i_table_id << 16) | i_extension;
     p_subdec->pf_detach = dvbpsi_atsc_DetachETT;

src/tables/atsc_mgt.c

@@ -119,7 +119,7 @@ bool dvbpsi_atsc_AttachMGT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id, uint16_t i_ex
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_atsc_GatherMGTSections;
+    p_subdec->pf_gather = &dvbpsi_atsc_GatherMGTSections;
     p_subdec->p_cb_data = p_mgt_decoder;
     p_subdec->i_id = ((uint32_t)i_table_id << 16) | i_extension;
     p_subdec->pf_detach = dvbpsi_atsc_DetachMGT;

src/tables/atsc_stt.c

@@ -98,7 +98,7 @@ bool dvbpsi_atsc_AttachSTT(dvbpsi_t* p_dvbpsi, uint8_t i_table_id,
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_atsc_GatherSTTSections;
+    p_subdec->pf_gather = &dvbpsi_atsc_GatherSTTSections;
     p_subdec->p_cb_data = p_stt_decoder;
     p_subdec->i_id = (uint32_t)i_table_id << 16;
     p_subdec->pf_detach = dvbpsi_atsc_DetachSTT;

src/tables/atsc_vct.c

@@ -128,7 +128,7 @@ bool dvbpsi_atsc_AttachVCT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id, uint16_t i_ex
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_atsc_GatherVCTSections;
+    p_subdec->pf_gather = &dvbpsi_atsc_GatherVCTSections;
     p_subdec->p_cb_data = p_vct_decoder;
     p_subdec->i_id = ((uint32_t)i_table_id << 16) | i_extension;
     p_subdec->pf_detach = dvbpsi_atsc_DetachVCT;

src/tables/bat.c

@@ -86,7 +86,7 @@ bool dvbpsi_AttachBAT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id,
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_GatherBATSections;
+    p_subdec->pf_gather = &dvbpsi_GatherBATSections;
     p_subdec->p_cb_data = p_bat_decoder;
     p_subdec->i_id = (uint32_t)i_table_id << 16 | (uint32_t)i_extension;
     p_subdec->pf_detach = dvbpsi_DetachBAT;

src/tables/eit.c

@@ -85,7 +85,7 @@ bool dvbpsi_AttachEIT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id, uint16_t i_extensi
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_GatherEITSections;
+    p_subdec->pf_gather = &dvbpsi_GatherEITSections;
     p_subdec->p_cb_data = p_eit_decoder;
     p_subdec->i_id = (uint32_t)i_table_id << 16 | (uint32_t)i_extension;
     p_subdec->pf_detach = dvbpsi_DetachEIT;

src/tables/nit.c

@@ -87,7 +87,7 @@ bool dvbpsi_AttachNIT(dvbpsi_t* p_dvbpsi, uint8_t i_table_id,
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_GatherNITSections;
+    p_subdec->pf_gather = &dvbpsi_GatherNITSections;
     p_subdec->p_cb_data = p_nit_decoder;
     p_subdec->i_id = (uint32_t)i_table_id << 16 | (uint32_t)i_extension;
     p_subdec->pf_detach = dvbpsi_DetachNIT;

src/tables/sdt.c

@@ -84,7 +84,7 @@ bool dvbpsi_AttachSDT(dvbpsi_t *p_dvbpsi, uint8_t i_table_id, uint16_t i_extensi
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_GatherSDTSections;
+    p_subdec->pf_gather = &dvbpsi_GatherSDTSections;
     p_subdec->p_cb_data = p_sdt_decoder;
     p_subdec->i_id = (uint32_t)i_table_id << 16 | (uint32_t)i_extension;
     p_subdec->pf_detach = &dvbpsi_DetachSDT;

src/tables/sis.c

@@ -86,7 +86,7 @@ bool dvbpsi_AttachSIS(dvbpsi_t *p_dvbpsi, uint8_t i_table_id, uint16_t i_extensi
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_GatherSISSections;
+    p_subdec->pf_gather = &dvbpsi_GatherSISSections;
     p_subdec->p_cb_data = p_sis_decoder;
     p_subdec->i_id = (uint32_t)i_table_id << 16 | (uint32_t)i_extension;
     p_subdec->pf_detach = dvbpsi_DetachSIS;

src/tables/tot.c

@@ -87,7 +87,7 @@ bool dvbpsi_AttachTOT(dvbpsi_t* p_dvbpsi, uint8_t i_table_id, uint16_t i_extensi
     }
 
     /* subtable decoder configuration */
-    p_subdec->pf_callback = &dvbpsi_GatherTOTSections;
+    p_subdec->pf_gather = &dvbpsi_GatherTOTSections;
     p_subdec->p_cb_data = p_tot_decoder;
     p_subdec->i_id = (uint32_t)i_table_id << 16 | (uint32_t)0;
     p_subdec->pf_detach = dvbpsi_DetachTOT;