Mark API's depreceated in preparation of release 1.0.0, with updated dvbpsi API.

Packagers and application developers should anticipate the following changes for libdvbpsi version 1.0.0:
- removal of struct dvbpsi_handle
- new struct dvbpsi_t (iso dvbpsi_handle)
- structure size changes, decoders share common members
- removal of printfs in libdvbpsi code
- adding message callback for error, warning and debugging messages

The API changes are needed to remove printfs from the library and to make the libdvbpsi API more consistent.

src/demux.h

 /*****************************************************************************
  * demux.h
  *
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Johan Bilien <jobi@via.ecp.fr>
@@ -130,6 +130,7 @@ typedef struct dvbpsi_demux_s
  * \param p_new_cb_data Data given to the previous callback.
  * \return a handle to the new demux structure.
  */
+__attribute__((deprecated))
 dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb,
                                  void *                p_new_cb_data);
 
@@ -141,7 +142,7 @@ dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb,
  * \brief Destroys a demux structure.
  * \param h_dvbpsi The handle of the demux to be destroyed.
  */
-
+__attribute__((deprecated))
 void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi);
 
 /*****************************************************************************
@@ -156,6 +157,7 @@ void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi);
  * \return a pointer to the found subdecoder, or NULL.
  *
  */
+__attribute__((deprecated))
 dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux,
                                               uint8_t          i_table_id,
                                               uint16_t         i_extension);
@@ -169,6 +171,7 @@ dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux,
  * \param h_dvbpsi PSI decoder handle.
  * \param p_section PSI section.
  */
+__attribute__((deprecated))
 void dvbpsi_Demux(dvbpsi_handle h_dvbpsi,
                   dvbpsi_psi_section_t * p_section);
 

src/dvbpsi.h

@@ -48,7 +48,7 @@ extern "C" {
  * \typedef struct dvbpsi_decoder_s * dvbpsi_handle
  * \brief Decoder abstration.
  */
-typedef struct dvbpsi_decoder_s * dvbpsi_handle;
+typedef struct dvbpsi_decoder_s * dvbpsi_handle __attribute__((depreceated));
 
 
 /*****************************************************************************
@@ -63,6 +63,7 @@ typedef struct dvbpsi_decoder_s * dvbpsi_handle;
  *
  * Injection of a TS packet into a PSI decoder.
  */
+__attribute__((deprecated))
 void dvbpsi_PushPacket(dvbpsi_handle h_dvbpsi, uint8_t* p_data);
 
 

src/dvbpsi_private.h

@@ -40,6 +40,7 @@ extern uint32_t dvbpsi_crc32_table[];
 #  define DVBPSI_ERROR_ARG(src, str, x...)                              \
         fprintf(stderr, "libdvbpsi error (" src "): " str "\n", x);
 #else
+   __attribute__((deprecated))
    static inline void DVBPSI_ERROR_ARG( char *src, const char *str, ... )
    { va_list ap; va_start( ap, str );
      vfprintf(stderr, str, ap); fprintf(stderr,"\n"); va_end( ap ); }
@@ -52,6 +53,7 @@ extern uint32_t dvbpsi_crc32_table[];
 #     define DVBPSI_DEBUG_ARG(src, str, x...)                           \
           fprintf(stderr, "libdvbpsi debug (" src "): " str "\n", x);
 #  else
+      __attribute__((deprecated))
       static inline void DVBPSI_DEBUG_ARG( char *src, const char *str, ... )
       { va_list ap; va_start( ap, str );
         vfprintf(stderr, str, ap); fprintf(stderr,"\n"); va_end( ap ); }
@@ -61,6 +63,7 @@ extern uint32_t dvbpsi_crc32_table[];
 #  ifdef HAVE_VARIADIC_MACROS
 #     define DVBPSI_DEBUG_ARG(src, str, x...)
 #  else
+      __attribute__((deprecated))
       static inline void DVBPSI_DEBUG_ARG( char *src, const char *str, ... ) {}
 #  endif
 #endif

src/psi.h

@@ -134,6 +134,7 @@ void dvbpsi_DeletePSISections(dvbpsi_psi_section_t * p_section);
  *
  * Check the CRC_32 if the section has b_syntax_indicator set.
  */
+__attribute__((deprecated))
 int dvbpsi_ValidPSISection(dvbpsi_psi_section_t* p_section);
 
 
@@ -146,6 +147,7 @@ int dvbpsi_ValidPSISection(dvbpsi_psi_section_t* p_section);
  * \param p_section pointer to the PSI section structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_BuildPSISection(dvbpsi_psi_section_t* p_section);
 
 

src/tables/bat.h

 /*****************************************************************************
  * bat.h
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id: bat.h  $
  *
  * Authors: Zhu zhenglu <zhuzlu@gmail.com>
@@ -126,6 +126,7 @@ typedef void (* dvbpsi_bat_callback)(void* p_cb_data, dvbpsi_bat_t* p_new_bat);
  * \param p_cb_data private data given in argument to the callback.
  * \return 0 if everything went ok.
  */
+__attribute__((deprecated))
 int dvbpsi_AttachBAT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
           uint16_t i_extension, dvbpsi_bat_callback pf_callback,
                                void* p_cb_data);
@@ -143,6 +144,7 @@ int dvbpsi_AttachBAT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
  * \param i_extension Table ID extension, here bouquet ID.
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_DetachBAT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
           uint16_t i_extension);
 
@@ -161,6 +163,7 @@ void dvbpsi_DetachBAT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
  * \param i_network_id original network id
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_InitBAT(dvbpsi_bat_t *p_bat, uint16_t i_bouquet_id, uint8_t i_version,
                     int b_current_next);
 
@@ -191,6 +194,7 @@ do {                                                                    \
  * \param p_bat pointer to the BAT structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_EmptyBAT(dvbpsi_bat_t *p_bat);
 
 /*!
@@ -208,7 +212,7 @@ do {                                                                    \
 /*****************************************************************************
  * dvbpsi_GenBATSections
  *****************************************************************************
- *!
+/*!
  * \fn dvbpsi_psi_section_t* dvbpsi_GenBATSections(dvbpsi_bat_t* p_bat)
  * \brief BAT generator
  * \param p_bat BAT structure
@@ -216,6 +220,7 @@ do {                                                                    \
  *
  * Generate BAT sections based on the dvbpsi_bat_t structure.
  *****************************************************************************/
+__attribute__((deprecated))
 dvbpsi_psi_section_t *dvbpsi_GenBATSections(dvbpsi_bat_t * p_bat);
 
 

src/tables/bat_private.h

 /*****************************************************************************
  * bat_private.h: private BAT structures
  *----------------------------------------------------------------------------
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id: bat_private.h 88 2004-02-24 14:31:18Z sam $
  *
  * Authors: Zhu zhenglu <zhuzlu@gmail.com>
@@ -55,6 +55,7 @@ typedef struct dvbpsi_bat_decoder_s
  *****************************************************************************
  * Callback for the PSI decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_GatherBATSections(dvbpsi_decoder_t* p_psi_decoder,
                       void* p_private_decoder,
                               dvbpsi_psi_section_t* p_section);
@@ -65,6 +66,7 @@ void dvbpsi_GatherBATSections(dvbpsi_decoder_t* p_psi_decoder,
  *****************************************************************************
  * BAT decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_DecodeBATSections(dvbpsi_bat_t* p_bat,
                               dvbpsi_psi_section_t* p_section);
 
@@ -74,6 +76,7 @@ void dvbpsi_DecodeBATSections(dvbpsi_bat_t* p_bat,
  *****************************************************************************
  * Add a TS description at the end of the BAT.
  *****************************************************************************/
+__attribute__((deprecated))
 dvbpsi_bat_ts_t *dvbpsi_BATAddTS(dvbpsi_bat_t* p_bat,
                                  uint16_t i_ts_id, uint16_t i_orig_network_id);
 
@@ -83,6 +86,7 @@ dvbpsi_bat_ts_t *dvbpsi_BATAddTS(dvbpsi_bat_t* p_bat,
  * Add a descriptor in the BAT Bouquet descriptors (the first loop description),
  *  which is in the first loop of BAT.
  *****************************************************************************/
+__attribute__((deprecated))
 dvbpsi_descriptor_t *dvbpsi_BATBouquetAddDescriptor(
                                                dvbpsi_bat_t *p_bat,
                                                uint8_t i_tag, uint8_t i_length,
@@ -93,6 +97,7 @@ dvbpsi_descriptor_t *dvbpsi_BATBouquetAddDescriptor(
  *****************************************************************************
  * Add a descriptor in the BAT TS descriptors, which is in the second loop of BAT.
  *****************************************************************************/
+__attribute__((deprecated))
 dvbpsi_descriptor_t *dvbpsi_BATTSAddDescriptor(
                                                dvbpsi_bat_ts_t *p_ts,
                                                uint8_t i_tag, uint8_t i_length,

src/tables/cat.h

 /*****************************************************************************
  * cat.h
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Johann Hanne
@@ -86,6 +86,7 @@ typedef void (* dvbpsi_cat_callback)(void* p_cb_data, dvbpsi_cat_t* p_new_cat);
  * \param p_cb_data private data given in argument to the callback
  * \return a pointer to the decoder for future calls.
  */
+__attribute__((deprecated))
 dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback,
                                void* p_cb_data);
 
@@ -101,6 +102,7 @@ dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback,
  *
  * The handle isn't valid any more.
  */
+__attribute__((deprecated))
 void dvbpsi_DetachCAT(dvbpsi_handle h_dvbpsi);
 
 
@@ -116,6 +118,7 @@ void dvbpsi_DetachCAT(dvbpsi_handle h_dvbpsi);
  * \param b_current_next current next indicator
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_InitCAT(dvbpsi_cat_t* p_cat,
                     uint8_t i_version, int b_current_next);
 
@@ -146,6 +149,7 @@ do {                                                                    \
  * \param p_cat pointer to the CAT structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_EmptyCAT(dvbpsi_cat_t* p_cat);
 
 /*!
@@ -176,6 +180,7 @@ do {                                                                    \
  * \param p_data descriptor's data
  * \return a pointer to the added descriptor.
  */
+__attribute__((deprecated))
 dvbpsi_descriptor_t* dvbpsi_CATAddDescriptor(dvbpsi_cat_t* p_cat,
                                              uint8_t i_tag, uint8_t i_length,
                                              uint8_t* p_data);
@@ -192,6 +197,7 @@ dvbpsi_descriptor_t* dvbpsi_CATAddDescriptor(dvbpsi_cat_t* p_cat,
  *
  * Generate CAT sections based on the dvbpsi_cat_t structure.
  */
+__attribute__((deprecated))
 dvbpsi_psi_section_t* dvbpsi_GenCATSections(dvbpsi_cat_t* p_cat);
 
 

src/tables/cat_private.h

 /*****************************************************************************
  * cat_private.h: private CAT structures
  *----------------------------------------------------------------------------
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Johann Hanne
@@ -55,6 +55,7 @@ typedef struct dvbpsi_cat_decoder_s
  *****************************************************************************
  * Callback for the PSI decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_GatherCATSections(dvbpsi_decoder_t* p_decoder,
                               dvbpsi_psi_section_t* p_section);
 
@@ -64,6 +65,7 @@ void dvbpsi_GatherCATSections(dvbpsi_decoder_t* p_decoder,
  *****************************************************************************
  * CAT decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_DecodeCATSections(dvbpsi_cat_t* p_cat,
                               dvbpsi_psi_section_t* p_section);
 

src/tables/eit.h

 /*****************************************************************************
  * eit.h
- * Copyright (C) 2004-2010 VideoLAN
+ * Copyright (C) 2004-2011 VideoLAN
  * $Id: eit.h 88 2004-02-24 14:31:18Z sam $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -126,6 +126,7 @@ typedef void (* dvbpsi_eit_callback)(void* p_cb_data, dvbpsi_eit_t* p_new_eit);
  * \param p_cb_data private data given in argument to the callback.
  * \return 0 if everything went ok.
  */
+__attribute__((deprecated))
 int dvbpsi_AttachEIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
           uint16_t i_extension, dvbpsi_eit_callback pf_callback,
                                void* p_cb_data);
@@ -143,6 +144,7 @@ int dvbpsi_AttachEIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
  * \param i_extension Table ID extension, here service ID.
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
           uint16_t i_extension);
 
@@ -166,6 +168,7 @@ void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
  * \param i_last_table_id i_last_table_id
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id, uint8_t i_version,
                     int b_current_next, uint16_t i_ts_id, uint16_t i_network_id,
                     uint8_t i_segment_last_section_number,
@@ -198,6 +201,7 @@ do {                                                                    \
  * \param p_eit pointer to the EIT structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit);
 
 /*!
@@ -251,6 +255,7 @@ dvbpsi_eit_event_t* dvbpsi_EITAddEvent(dvbpsi_eit_t* p_eit,
  * \param p_data descriptor's data
  * \return a pointer to the added descriptor.
  */
+__attribute__((deprecated))
 dvbpsi_descriptor_t* dvbpsi_EITEventAddDescriptor(
                                                dvbpsi_eit_event_t* p_event,
                                                uint8_t i_tag, uint8_t i_length,

src/tables/eit_private.h

 /*****************************************************************************
  * eit_private.h: private EIT structures
  *----------------------------------------------------------------------------
- * Copyright (C) 2004-2010 VideoLAN
+ * Copyright (C) 2004-2011 VideoLAN
  * $Id: eit_private.h 88 2004-02-24 14:31:18Z sam $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -55,6 +55,7 @@ typedef struct dvbpsi_eit_decoder_s
  *****************************************************************************
  * Callback for the PSI decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_GatherEITSections(dvbpsi_decoder_t* p_psi_decoder,
                       void* p_private_decoder,
                               dvbpsi_psi_section_t* p_section);
@@ -65,6 +66,7 @@ void dvbpsi_GatherEITSections(dvbpsi_decoder_t* p_psi_decoder,
  *****************************************************************************
  * EIT decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_DecodeEITSections(dvbpsi_eit_t* p_eit,
                               dvbpsi_psi_section_t* p_section);
 

src/tables/nit.h

 /*****************************************************************************
  * nit.h
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Johann Hanne
@@ -120,6 +120,7 @@ typedef void (* dvbpsi_nit_callback)(void* p_cb_data, dvbpsi_nit_t* p_new_nit);
  * \param p_cb_data private data given in argument to the callback.
  * \return 0 if everything went ok.
  */
+__attribute__((deprecated))
 int dvbpsi_AttachNIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
                      uint16_t i_extension, dvbpsi_nit_callback pf_callback,
                      void* p_cb_data);
@@ -137,6 +138,7 @@ int dvbpsi_AttachNIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
  * \param i_extension Table ID extension, here service ID.
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
                       uint16_t i_extension);
 
@@ -154,6 +156,7 @@ void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
  * \param b_current_next current next indicator
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_InitNIT(dvbpsi_nit_t* p_nit, uint16_t i_network_id,
                     uint8_t i_version, int b_current_next);
 
@@ -186,6 +189,7 @@ do {                                                                    \
  * \param p_nit pointer to the NIT structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_EmptyNIT(dvbpsi_nit_t* p_nit);
 
 /*!
@@ -216,6 +220,7 @@ do {                                                                    \
  * \param p_data descriptor's data
  * \return a pointer to the added descriptor.
  */
+__attribute__((deprecated))
 dvbpsi_descriptor_t* dvbpsi_NITAddDescriptor(dvbpsi_nit_t* p_nit,
                                              uint8_t i_tag, uint8_t i_length,
                                              uint8_t* p_data);
@@ -233,6 +238,7 @@ dvbpsi_descriptor_t* dvbpsi_NITAddDescriptor(dvbpsi_nit_t* p_nit,
  * \param i_pid PID of the TS
  * \return a pointer to the added TS.
  */
+__attribute__((deprecated))
 dvbpsi_nit_ts_t* dvbpsi_NITAddTS(dvbpsi_nit_t* p_nit,
                                  uint16_t i_ts_id, uint16_t i_orig_network_id);
 
@@ -252,6 +258,7 @@ dvbpsi_nit_ts_t* dvbpsi_NITAddTS(dvbpsi_nit_t* p_nit,
  * \param p_data descriptor's data
  * \return a pointer to the added descriptor.
  */
+__attribute__((deprecated))
 dvbpsi_descriptor_t* dvbpsi_NITTSAddDescriptor(dvbpsi_nit_ts_t* p_ts,
                                                uint8_t i_tag, uint8_t i_length,
                                                uint8_t* p_data);
@@ -270,6 +277,7 @@ dvbpsi_descriptor_t* dvbpsi_NITTSAddDescriptor(dvbpsi_nit_ts_t* p_ts,
  *
  * Generate NIT sections based on the dvbpsi_nit_t structure.
  */
+__attribute__((deprecated))
 dvbpsi_psi_section_t* dvbpsi_GenNITSections(dvbpsi_nit_t* p_nit,
                                             uint8_t i_table_id);
 

src/tables/nit_private.h

 /*****************************************************************************
  * nit_private.h: private NIT structures
  *----------------------------------------------------------------------------
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Johann Hanne
@@ -57,6 +57,7 @@ typedef struct dvbpsi_nit_decoder_s
  *****************************************************************************
  * Callback for the PSI decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_GatherNITSections(dvbpsi_decoder_t* p_psi_decoder,
                               void* p_private_decoder,
                               dvbpsi_psi_section_t* p_section);
@@ -67,6 +68,7 @@ void dvbpsi_GatherNITSections(dvbpsi_decoder_t* p_psi_decoder,
  *****************************************************************************
  * NIT decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_DecodeNITSections(dvbpsi_nit_t* p_nit,
                               dvbpsi_psi_section_t* p_section);
 

src/tables/pat.h

 /*****************************************************************************
  * pat.h
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
@@ -110,6 +110,7 @@ typedef void (* dvbpsi_pat_callback)(void* p_cb_data, dvbpsi_pat_t* p_new_pat);
  * \param p_cb_data private data given in argument to the callback
  * \return a pointer to the decoder for future calls.
  */
+__attribute__((deprecated))
 dvbpsi_handle dvbpsi_AttachPAT(dvbpsi_pat_callback pf_callback,
                                void* p_cb_data);
 
@@ -125,6 +126,7 @@ dvbpsi_handle dvbpsi_AttachPAT(dvbpsi_pat_callback pf_callback,
  *
  * The handle isn't valid any more.
  */
+__attribute__((deprecated))
 void dvbpsi_DetachPAT(dvbpsi_handle h_dvbpsi);
 
 
@@ -141,6 +143,7 @@ void dvbpsi_DetachPAT(dvbpsi_handle h_dvbpsi);
  * \param b_current_next current next indicator
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_InitPAT(dvbpsi_pat_t* p_pat, uint16_t i_ts_id, uint8_t i_version,
                     int b_current_next);
 
@@ -170,6 +173,7 @@ do {                                                                    \
  * \param p_pat pointer to the PAT structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_EmptyPAT(dvbpsi_pat_t* p_pat);
 
 /*!
@@ -198,6 +202,7 @@ do {                                                                    \
  * \param i_pid PID of the NIT/PMT
  * \return a pointer to the added program.
  */
+__attribute__((deprecated))
 dvbpsi_pat_program_t* dvbpsi_PATAddProgram(dvbpsi_pat_t* p_pat,
                                            uint16_t i_number, uint16_t i_pid);
 
@@ -215,6 +220,7 @@ dvbpsi_pat_program_t* dvbpsi_PATAddProgram(dvbpsi_pat_t* p_pat,
  *
  * Generate PAT sections based on the dvbpsi_pat_t structure.
  */
+__attribute__((deprecated))
 dvbpsi_psi_section_t* dvbpsi_GenPATSections(dvbpsi_pat_t* p_pat,
                                             int i_max_pps);
 

src/tables/pat_private.h

 /*****************************************************************************
  * pat_private.h: private PAT structures
  *----------------------------------------------------------------------------
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id: pat_private.h,v 1.1 2002/01/22 20:30:16 bozo Exp $
  *
  * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
@@ -54,6 +54,7 @@ typedef struct dvbpsi_pat_decoder_s
  *****************************************************************************
  * Callback for the PSI decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_GatherPATSections(dvbpsi_decoder_t* p_decoder,
                               dvbpsi_psi_section_t* p_section);
 
@@ -63,6 +64,7 @@ void dvbpsi_GatherPATSections(dvbpsi_decoder_t* p_decoder,
  *****************************************************************************
  * PAT decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_DecodePATSections(dvbpsi_pat_t* p_pat,
                               dvbpsi_psi_section_t* p_section);
 

src/tables/pmt.h

 /*****************************************************************************
  * pmt.h
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
@@ -118,6 +118,7 @@ typedef void (* dvbpsi_pmt_callback)(void* p_cb_data, dvbpsi_pmt_t* p_new_pmt);
  * \param p_cb_data private data given in argument to the callback
  * \return a pointer to the decoder for future calls.
  */
+__attribute__((deprecated))
 dvbpsi_handle dvbpsi_AttachPMT(uint16_t i_program_number,
                                dvbpsi_pmt_callback pf_callback,
                                void* p_cb_data);
@@ -134,6 +135,7 @@ dvbpsi_handle dvbpsi_AttachPMT(uint16_t i_program_number,
  *
  * The handle isn't valid any more.
  */
+__attribute__((deprecated))
 void dvbpsi_DetachPMT(dvbpsi_handle h_dvbpsi);
 
 
@@ -152,6 +154,7 @@ void dvbpsi_DetachPMT(dvbpsi_handle h_dvbpsi);
  * \param i_pcr_pid PCR_PID
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_InitPMT(dvbpsi_pmt_t* p_pmt, uint16_t i_program_number,
                     uint8_t i_version, int b_current_next, uint16_t i_pcr_pid);
 
@@ -185,6 +188,7 @@ do {                                                                    \
  * \param p_pmt pointer to the PMT structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_EmptyPMT(dvbpsi_pmt_t* p_pmt);
 
 /*!
@@ -215,6 +219,7 @@ do {                                                                    \
  * \param p_data descriptor's data
  * \return a pointer to the added descriptor.
  */
+__attribute__((deprecated))
 dvbpsi_descriptor_t* dvbpsi_PMTAddDescriptor(dvbpsi_pmt_t* p_pmt,
                                              uint8_t i_tag, uint8_t i_length,
                                              uint8_t* p_data);
@@ -232,6 +237,7 @@ dvbpsi_descriptor_t* dvbpsi_PMTAddDescriptor(dvbpsi_pmt_t* p_pmt,
  * \param i_pid PID of the ES
  * \return a pointer to the added ES.
  */
+__attribute__((deprecated))
 dvbpsi_pmt_es_t* dvbpsi_PMTAddES(dvbpsi_pmt_t* p_pmt,
                                  uint8_t i_type, uint16_t i_pid);
 
@@ -251,6 +257,7 @@ dvbpsi_pmt_es_t* dvbpsi_PMTAddES(dvbpsi_pmt_t* p_pmt,
  * \param p_data descriptor's data
  * \return a pointer to the added descriptor.
  */
+__attribute__((deprecated))
 dvbpsi_descriptor_t* dvbpsi_PMTESAddDescriptor(dvbpsi_pmt_es_t* p_es,
                                                uint8_t i_tag, uint8_t i_length,
                                                uint8_t* p_data);
@@ -267,6 +274,7 @@ dvbpsi_descriptor_t* dvbpsi_PMTESAddDescriptor(dvbpsi_pmt_es_t* p_es,
  *
  * Generate PMT sections based on the dvbpsi_pmt_t structure.
  */
+__attribute__((deprecated))
 dvbpsi_psi_section_t* dvbpsi_GenPMTSections(dvbpsi_pmt_t* p_pmt);
 
 

src/tables/pmt_private.h

 /*****************************************************************************
  * pmt_private.h: private PMT structures
  *----------------------------------------------------------------------------
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id: pmt_private.h,v 1.1 2002/01/22 20:30:16 bozo Exp $
  *
  * Authors: Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>
@@ -55,6 +55,7 @@ typedef struct dvbpsi_pmt_decoder_s
  *****************************************************************************
  * Callback for the PSI decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_GatherPMTSections(dvbpsi_decoder_t* p_decoder,
                               dvbpsi_psi_section_t* p_section);
 
@@ -64,6 +65,7 @@ void dvbpsi_GatherPMTSections(dvbpsi_decoder_t* p_decoder,
  *****************************************************************************
  * PMT decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_DecodePMTSections(dvbpsi_pmt_t* p_pmt,
                               dvbpsi_psi_section_t* p_section);
 

src/tables/sdt.h

 /*****************************************************************************
  * sdt.h
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Johan Bilien <jobi@via.ecp.fr>
@@ -125,6 +125,7 @@ typedef void (* dvbpsi_sdt_callback)(void* p_cb_data, dvbpsi_sdt_t* p_new_sdt);
  * \param p_cb_data private data given in argument to the callback.
  * \return 0 if everything went ok.
  */
+__attribute__((deprecated))
 int dvbpsi_AttachSDT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
           uint16_t i_extension, dvbpsi_sdt_callback pf_callback,
                                void* p_cb_data);
@@ -142,6 +143,7 @@ int dvbpsi_AttachSDT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
  * \param i_extension Table ID extension, here TS ID.
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_DetachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
           uint16_t i_extension);
 
@@ -160,6 +162,7 @@ void dvbpsi_DetachSDT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
  * \param i_network_id original network id
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_InitSDT(dvbpsi_sdt_t *p_sdt, uint16_t i_ts_id, uint8_t i_version,
                     int b_current_next, uint16_t i_network_id);
 
@@ -190,6 +193,7 @@ do {                                                                    \
  * \param p_sdt pointer to the SDT structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_EmptySDT(dvbpsi_sdt_t *p_sdt);
 
 /*!
@@ -224,6 +228,7 @@ do {                                                                    \
  * \param b_free_ca Free CA flag
  * \return a pointer to the added service description.
  */
+__attribute__((deprecated))
 dvbpsi_sdt_service_t *dvbpsi_SDTAddService(dvbpsi_sdt_t* p_sdt,
     uint16_t i_service_id, int b_eit_schedule, int b_eit_present,
     uint8_t i_running_status,int b_free_ca);
@@ -244,6 +249,7 @@ dvbpsi_sdt_service_t *dvbpsi_SDTAddService(dvbpsi_sdt_t* p_sdt,
  * \param p_data descriptor's data
  * \return a pointer to the added descriptor.
  */
+__attribute__((deprecated))
 dvbpsi_descriptor_t *dvbpsi_SDTServiceAddDescriptor(
                                                dvbpsi_sdt_service_t *p_service,
                                                uint8_t i_tag, uint8_t i_length,

src/tables/sdt_private.h

 /*****************************************************************************
  * sdt_private.h: private SDT structures
  *----------------------------------------------------------------------------
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id: sdt_private.h,v 1.1 2002/12/11 13:04:57 jobi Exp $
  *
  * Authors: Johan Bilien <jobi@via.ecp.fr>
@@ -54,6 +54,7 @@ typedef struct dvbpsi_sdt_decoder_s
  *****************************************************************************
  * Callback for the PSI decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_GatherSDTSections(dvbpsi_decoder_t* p_psi_decoder,
                       void* p_private_decoder,
                               dvbpsi_psi_section_t* p_section);
@@ -64,6 +65,7 @@ void dvbpsi_GatherSDTSections(dvbpsi_decoder_t* p_psi_decoder,
  *****************************************************************************
  * SDT decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_DecodeSDTSections(dvbpsi_sdt_t* p_sdt,
                               dvbpsi_psi_section_t* p_section);
 

src/tables/sis.h

 /*****************************************************************************
  * sis.h
- * Copyright (c) 2010 VideoLAN
+ * Copyright (c) 2010-2011 VideoLAN
  * $Id$
  *
  * Authors: Jean-Paul Saman <jpsaman@videolan.org>
@@ -121,6 +121,7 @@ typedef void (* dvbpsi_sis_callback)(void* p_cb_data, dvbpsi_sis_t* p_new_sis);
  * \param p_cb_data private data given in argument to the callback.
  * \return 0 if everything went ok.
  */
+__attribute__((deprecated))
 int dvbpsi_AttachSIS(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
           uint16_t i_extension, dvbpsi_sis_callback pf_callback,
                                void* p_cb_data);
@@ -138,6 +139,7 @@ int dvbpsi_AttachSIS(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
  * \param i_extension Table ID extension, here TS ID.
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_DetachSIS(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
           uint16_t i_extension);
 
@@ -153,6 +155,7 @@ void dvbpsi_DetachSIS(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
  * \param i_protocol_version SIS protocol version (currently 0)
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_InitSIS(dvbpsi_sis_t *p_sis, uint8_t i_protocol_version);
 
 /*!
@@ -178,6 +181,7 @@ do {                                                                    \
  * \param p_sis pointer to the SIS structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_EmptySIS(dvbpsi_sis_t *p_sis);
 
 /*!
@@ -206,6 +210,7 @@ do {                                                                    \
  * \param p_data descriptor's data
  * \return a pointer to the added descriptor.
  */
+__attribute__((deprecated))
 dvbpsi_descriptor_t *dvbpsi_SISAddDescriptor( dvbpsi_sis_t *p_sis,
                                               uint8_t i_tag, uint8_t i_length,
                                               uint8_t *p_data);
@@ -215,6 +220,7 @@ dvbpsi_descriptor_t *dvbpsi_SISAddDescriptor( dvbpsi_sis_t *p_sis,
  *****************************************************************************
  * Generate SIS sections based on the dvbpsi_sis_t structure.
  *****************************************************************************/
+__attribute__((deprecated))
 dvbpsi_psi_section_t *dvbpsi_GenSISSections(dvbpsi_sis_t * p_sis);
 
 #ifdef __cplusplus

src/tables/sis_private.h

 /*****************************************************************************
  * sis_private.h: private SIS structures
  *----------------------------------------------------------------------------
- * Copyright (c) 2010 VideoLAN
+ * Copyright (c) 2011 VideoLAN
  * $Id$
  *
  * Authors: Jean-Paul Saman <jpsaman@videolan.org>
@@ -51,6 +51,7 @@ typedef struct dvbpsi_sis_decoder_s
  *****************************************************************************
  * Callback for the PSI decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_GatherSISSections(dvbpsi_decoder_t* p_psi_decoder,
                               void* p_private_decoder,
                               dvbpsi_psi_section_t* p_section);
@@ -61,6 +62,7 @@ void dvbpsi_GatherSISSections(dvbpsi_decoder_t* p_psi_decoder,
  *****************************************************************************
  * SIS decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_DecodeSISSections(dvbpsi_sis_t* p_sis,
                               dvbpsi_psi_section_t* p_section);
 

src/tables/tot.h

 /*****************************************************************************
  * tot.h
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Johann Hanne
@@ -90,6 +90,7 @@ typedef void (* dvbpsi_tot_callback)(void* p_cb_data, dvbpsi_tot_t* p_new_tot);
  * \param p_cb_data private data given in argument to the callback.
  * \return 0 if everything went ok.
  */
+__attribute__((deprecated))
 int dvbpsi_AttachTOT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
                      uint16_t i_extension,
                      dvbpsi_tot_callback pf_callback, void* p_cb_data);
@@ -106,6 +107,7 @@ int dvbpsi_AttachTOT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
  * \param i_extension Table ID extension, unused in the TDT/TOT
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_DetachTOT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
                       uint16_t i_extension);
 
@@ -120,6 +122,7 @@ void dvbpsi_DetachTOT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
  * \param i_utc_time the time in UTC
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_InitTOT(dvbpsi_tot_t* p_tot, uint64_t i_utc_time);
 
 /*!
@@ -146,6 +149,7 @@ do {                                                                    \
  * \param p_tot pointer to the TDT/TOT structure
  * \return nothing.
  */
+__attribute__((deprecated))
 void dvbpsi_EmptyTOT(dvbpsi_tot_t* p_tot);
 
 /*!
@@ -176,6 +180,7 @@ do {                                                                    \
  * \param p_data descriptor's data
  * \return a pointer to the added descriptor.
  */
+__attribute__((deprecated))
 dvbpsi_descriptor_t* dvbpsi_TOTAddDescriptor(dvbpsi_tot_t* p_tot,
                                              uint8_t i_tag, uint8_t i_length,
                                              uint8_t* p_data);
@@ -192,6 +197,7 @@ dvbpsi_descriptor_t* dvbpsi_TOTAddDescriptor(dvbpsi_tot_t* p_tot,
  *
  * Generate TDT/TOT sections based on the dvbpsi_tot_t structure.
  */
+__attribute__((deprecated))
 dvbpsi_psi_section_t* dvbpsi_GenTOTSections(dvbpsi_tot_t* p_tot);
 
 

src/tables/tot_private.h

 /*****************************************************************************
  * tot_private.h: private TDT/TOT structures
  *----------------------------------------------------------------------------
- * Copyright (C) 2001-2010 VideoLAN
+ * Copyright (C) 2001-2011 VideoLAN
  * $Id$
  *
  * Authors: Johann Hanne
@@ -47,6 +47,7 @@ typedef struct dvbpsi_tot_decoder_s
  *****************************************************************************
  * Callback for the PSI decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_GatherTOTSections(dvbpsi_decoder_t* p_decoder,
                               void * p_private_decoder,
                               dvbpsi_psi_section_t* p_section);
@@ -57,6 +58,7 @@ void dvbpsi_GatherTOTSections(dvbpsi_decoder_t* p_decoder,
  *****************************************************************************
  * Check the CRC_32 if the section has b_syntax_indicator set.
  *****************************************************************************/
+__attribute__((deprecated))
 int dvbpsi_ValidTOTSection(dvbpsi_psi_section_t* p_section);
 
 /*****************************************************************************
@@ -64,6 +66,7 @@ int dvbpsi_ValidTOTSection(dvbpsi_psi_section_t* p_section);
  *****************************************************************************
  * TDT/TOT decoder.
  *****************************************************************************/
+__attribute__((deprecated))
 void dvbpsi_DecodeTOTSections(dvbpsi_tot_t* p_tot,
                               dvbpsi_psi_section_t* p_section);