Commit fa693236 authored by Jean-Paul Saman's avatar Jean-Paul Saman

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.
parent 3272675b
/***************************************************************************** /*****************************************************************************
* demux.h * demux.h
* *
* Copyright (C) 2001-2010 VideoLAN * Copyright (C) 2001-2011 VideoLAN
* $Id$ * $Id$
* *
* Authors: Johan Bilien <jobi@via.ecp.fr> * Authors: Johan Bilien <jobi@via.ecp.fr>
...@@ -130,6 +130,7 @@ typedef struct dvbpsi_demux_s ...@@ -130,6 +130,7 @@ typedef struct dvbpsi_demux_s
* \param p_new_cb_data Data given to the previous callback. * \param p_new_cb_data Data given to the previous callback.
* \return a handle to the new demux structure. * \return a handle to the new demux structure.
*/ */
__attribute__((deprecated))
dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb, dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb,
void * p_new_cb_data); void * p_new_cb_data);
...@@ -141,7 +142,7 @@ dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb, ...@@ -141,7 +142,7 @@ dvbpsi_handle dvbpsi_AttachDemux(dvbpsi_demux_new_cb_t pf_new_cb,
* \brief Destroys a demux structure. * \brief Destroys a demux structure.
* \param h_dvbpsi The handle of the demux to be destroyed. * \param h_dvbpsi The handle of the demux to be destroyed.
*/ */
__attribute__((deprecated))
void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi); void dvbpsi_DetachDemux(dvbpsi_handle h_dvbpsi);
/***************************************************************************** /*****************************************************************************
...@@ -156,6 +157,7 @@ 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. * \return a pointer to the found subdecoder, or NULL.
* *
*/ */
__attribute__((deprecated))
dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux, dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux,
uint8_t i_table_id, uint8_t i_table_id,
uint16_t i_extension); uint16_t i_extension);
...@@ -169,6 +171,7 @@ dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux, ...@@ -169,6 +171,7 @@ dvbpsi_demux_subdec_t * dvbpsi_demuxGetSubDec(dvbpsi_demux_t * p_demux,
* \param h_dvbpsi PSI decoder handle. * \param h_dvbpsi PSI decoder handle.
* \param p_section PSI section. * \param p_section PSI section.
*/ */
__attribute__((deprecated))
void dvbpsi_Demux(dvbpsi_handle h_dvbpsi, void dvbpsi_Demux(dvbpsi_handle h_dvbpsi,
dvbpsi_psi_section_t * p_section); dvbpsi_psi_section_t * p_section);
......
...@@ -48,7 +48,7 @@ extern "C" { ...@@ -48,7 +48,7 @@ extern "C" {
* \typedef struct dvbpsi_decoder_s * dvbpsi_handle * \typedef struct dvbpsi_decoder_s * dvbpsi_handle
* \brief Decoder abstration. * \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; ...@@ -63,6 +63,7 @@ typedef struct dvbpsi_decoder_s * dvbpsi_handle;
* *
* Injection of a TS packet into a PSI decoder. * Injection of a TS packet into a PSI decoder.
*/ */
__attribute__((deprecated))
void dvbpsi_PushPacket(dvbpsi_handle h_dvbpsi, uint8_t* p_data); void dvbpsi_PushPacket(dvbpsi_handle h_dvbpsi, uint8_t* p_data);
......
...@@ -40,6 +40,7 @@ extern uint32_t dvbpsi_crc32_table[]; ...@@ -40,6 +40,7 @@ extern uint32_t dvbpsi_crc32_table[];
# define DVBPSI_ERROR_ARG(src, str, x...) \ # define DVBPSI_ERROR_ARG(src, str, x...) \
fprintf(stderr, "libdvbpsi error (" src "): " str "\n", x); fprintf(stderr, "libdvbpsi error (" src "): " str "\n", x);
#else #else
__attribute__((deprecated))
static inline void DVBPSI_ERROR_ARG( char *src, const char *str, ... ) static inline void DVBPSI_ERROR_ARG( char *src, const char *str, ... )
{ va_list ap; va_start( ap, str ); { va_list ap; va_start( ap, str );
vfprintf(stderr, str, ap); fprintf(stderr,"\n"); va_end( ap ); } vfprintf(stderr, str, ap); fprintf(stderr,"\n"); va_end( ap ); }
...@@ -52,6 +53,7 @@ extern uint32_t dvbpsi_crc32_table[]; ...@@ -52,6 +53,7 @@ extern uint32_t dvbpsi_crc32_table[];
# define DVBPSI_DEBUG_ARG(src, str, x...) \ # define DVBPSI_DEBUG_ARG(src, str, x...) \
fprintf(stderr, "libdvbpsi debug (" src "): " str "\n", x); fprintf(stderr, "libdvbpsi debug (" src "): " str "\n", x);
# else # else
__attribute__((deprecated))
static inline void DVBPSI_DEBUG_ARG( char *src, const char *str, ... ) static inline void DVBPSI_DEBUG_ARG( char *src, const char *str, ... )
{ va_list ap; va_start( ap, str ); { va_list ap; va_start( ap, str );
vfprintf(stderr, str, ap); fprintf(stderr,"\n"); va_end( ap ); } vfprintf(stderr, str, ap); fprintf(stderr,"\n"); va_end( ap ); }
...@@ -61,6 +63,7 @@ extern uint32_t dvbpsi_crc32_table[]; ...@@ -61,6 +63,7 @@ extern uint32_t dvbpsi_crc32_table[];
# ifdef HAVE_VARIADIC_MACROS # ifdef HAVE_VARIADIC_MACROS
# define DVBPSI_DEBUG_ARG(src, str, x...) # define DVBPSI_DEBUG_ARG(src, str, x...)
# else # else
__attribute__((deprecated))
static inline void DVBPSI_DEBUG_ARG( char *src, const char *str, ... ) {} static inline void DVBPSI_DEBUG_ARG( char *src, const char *str, ... ) {}
# endif # endif
#endif #endif
......
...@@ -134,6 +134,7 @@ void dvbpsi_DeletePSISections(dvbpsi_psi_section_t * p_section); ...@@ -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. * Check the CRC_32 if the section has b_syntax_indicator set.
*/ */
__attribute__((deprecated))
int dvbpsi_ValidPSISection(dvbpsi_psi_section_t* p_section); int dvbpsi_ValidPSISection(dvbpsi_psi_section_t* p_section);
...@@ -146,6 +147,7 @@ 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 * \param p_section pointer to the PSI section structure
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_BuildPSISection(dvbpsi_psi_section_t* p_section); void dvbpsi_BuildPSISection(dvbpsi_psi_section_t* p_section);
......
/***************************************************************************** /*****************************************************************************
* bat.h * bat.h
* Copyright (C) 2001-2010 VideoLAN * Copyright (C) 2001-2011 VideoLAN
* $Id: bat.h $ * $Id: bat.h $
* *
* Authors: Zhu zhenglu <zhuzlu@gmail.com> * 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); ...@@ -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. * \param p_cb_data private data given in argument to the callback.
* \return 0 if everything went ok. * \return 0 if everything went ok.
*/ */
__attribute__((deprecated))
int dvbpsi_AttachBAT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id, int dvbpsi_AttachBAT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
uint16_t i_extension, dvbpsi_bat_callback pf_callback, uint16_t i_extension, dvbpsi_bat_callback pf_callback,
void* p_cb_data); void* p_cb_data);
...@@ -143,6 +144,7 @@ int dvbpsi_AttachBAT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id, ...@@ -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. * \param i_extension Table ID extension, here bouquet ID.
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_DetachBAT(dvbpsi_demux_t * p_demux, uint8_t i_table_id, void dvbpsi_DetachBAT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
uint16_t i_extension); uint16_t i_extension);
...@@ -161,6 +163,7 @@ void dvbpsi_DetachBAT(dvbpsi_demux_t * p_demux, uint8_t i_table_id, ...@@ -161,6 +163,7 @@ void dvbpsi_DetachBAT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
* \param i_network_id original network id * \param i_network_id original network id
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_InitBAT(dvbpsi_bat_t *p_bat, uint16_t i_bouquet_id, uint8_t i_version, void dvbpsi_InitBAT(dvbpsi_bat_t *p_bat, uint16_t i_bouquet_id, uint8_t i_version,
int b_current_next); int b_current_next);
...@@ -191,6 +194,7 @@ do { \ ...@@ -191,6 +194,7 @@ do { \
* \param p_bat pointer to the BAT structure * \param p_bat pointer to the BAT structure
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_EmptyBAT(dvbpsi_bat_t *p_bat); void dvbpsi_EmptyBAT(dvbpsi_bat_t *p_bat);
/*! /*!
...@@ -208,7 +212,7 @@ do { \ ...@@ -208,7 +212,7 @@ do { \
/***************************************************************************** /*****************************************************************************
* dvbpsi_GenBATSections * dvbpsi_GenBATSections
***************************************************************************** *****************************************************************************
*! /*!
* \fn dvbpsi_psi_section_t* dvbpsi_GenBATSections(dvbpsi_bat_t* p_bat) * \fn dvbpsi_psi_section_t* dvbpsi_GenBATSections(dvbpsi_bat_t* p_bat)
* \brief BAT generator * \brief BAT generator
* \param p_bat BAT structure * \param p_bat BAT structure
...@@ -216,6 +220,7 @@ do { \ ...@@ -216,6 +220,7 @@ do { \
* *
* Generate BAT sections based on the dvbpsi_bat_t structure. * Generate BAT sections based on the dvbpsi_bat_t structure.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
dvbpsi_psi_section_t *dvbpsi_GenBATSections(dvbpsi_bat_t * p_bat); dvbpsi_psi_section_t *dvbpsi_GenBATSections(dvbpsi_bat_t * p_bat);
......
/***************************************************************************** /*****************************************************************************
* bat_private.h: private BAT structures * 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 $ * $Id: bat_private.h 88 2004-02-24 14:31:18Z sam $
* *
* Authors: Zhu zhenglu <zhuzlu@gmail.com> * Authors: Zhu zhenglu <zhuzlu@gmail.com>
...@@ -55,6 +55,7 @@ typedef struct dvbpsi_bat_decoder_s ...@@ -55,6 +55,7 @@ typedef struct dvbpsi_bat_decoder_s
***************************************************************************** *****************************************************************************
* Callback for the PSI decoder. * Callback for the PSI decoder.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
void dvbpsi_GatherBATSections(dvbpsi_decoder_t* p_psi_decoder, void dvbpsi_GatherBATSections(dvbpsi_decoder_t* p_psi_decoder,
void* p_private_decoder, void* p_private_decoder,
dvbpsi_psi_section_t* p_section); dvbpsi_psi_section_t* p_section);
...@@ -65,6 +66,7 @@ void dvbpsi_GatherBATSections(dvbpsi_decoder_t* p_psi_decoder, ...@@ -65,6 +66,7 @@ void dvbpsi_GatherBATSections(dvbpsi_decoder_t* p_psi_decoder,
***************************************************************************** *****************************************************************************
* BAT decoder. * BAT decoder.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
void dvbpsi_DecodeBATSections(dvbpsi_bat_t* p_bat, void dvbpsi_DecodeBATSections(dvbpsi_bat_t* p_bat,
dvbpsi_psi_section_t* p_section); dvbpsi_psi_section_t* p_section);
...@@ -74,6 +76,7 @@ void dvbpsi_DecodeBATSections(dvbpsi_bat_t* p_bat, ...@@ -74,6 +76,7 @@ void dvbpsi_DecodeBATSections(dvbpsi_bat_t* p_bat,
***************************************************************************** *****************************************************************************
* Add a TS description at the end of the BAT. * Add a TS description at the end of the BAT.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
dvbpsi_bat_ts_t *dvbpsi_BATAddTS(dvbpsi_bat_t* p_bat, dvbpsi_bat_ts_t *dvbpsi_BATAddTS(dvbpsi_bat_t* p_bat,
uint16_t i_ts_id, uint16_t i_orig_network_id); 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, ...@@ -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), * Add a descriptor in the BAT Bouquet descriptors (the first loop description),
* which is in the first loop of BAT. * which is in the first loop of BAT.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
dvbpsi_descriptor_t *dvbpsi_BATBouquetAddDescriptor( dvbpsi_descriptor_t *dvbpsi_BATBouquetAddDescriptor(
dvbpsi_bat_t *p_bat, dvbpsi_bat_t *p_bat,
uint8_t i_tag, uint8_t i_length, uint8_t i_tag, uint8_t i_length,
...@@ -93,6 +97,7 @@ dvbpsi_descriptor_t *dvbpsi_BATBouquetAddDescriptor( ...@@ -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. * Add a descriptor in the BAT TS descriptors, which is in the second loop of BAT.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
dvbpsi_descriptor_t *dvbpsi_BATTSAddDescriptor( dvbpsi_descriptor_t *dvbpsi_BATTSAddDescriptor(
dvbpsi_bat_ts_t *p_ts, dvbpsi_bat_ts_t *p_ts,
uint8_t i_tag, uint8_t i_length, uint8_t i_tag, uint8_t i_length,
......
/***************************************************************************** /*****************************************************************************
* cat.h * cat.h
* Copyright (C) 2001-2010 VideoLAN * Copyright (C) 2001-2011 VideoLAN
* $Id$ * $Id$
* *
* Authors: Johann Hanne * Authors: Johann Hanne
...@@ -86,6 +86,7 @@ typedef void (* dvbpsi_cat_callback)(void* p_cb_data, dvbpsi_cat_t* p_new_cat); ...@@ -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 * \param p_cb_data private data given in argument to the callback
* \return a pointer to the decoder for future calls. * \return a pointer to the decoder for future calls.
*/ */
__attribute__((deprecated))
dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback, dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback,
void* p_cb_data); void* p_cb_data);
...@@ -101,6 +102,7 @@ dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback, ...@@ -101,6 +102,7 @@ dvbpsi_handle dvbpsi_AttachCAT(dvbpsi_cat_callback pf_callback,
* *
* The handle isn't valid any more. * The handle isn't valid any more.
*/ */
__attribute__((deprecated))
void dvbpsi_DetachCAT(dvbpsi_handle h_dvbpsi); void dvbpsi_DetachCAT(dvbpsi_handle h_dvbpsi);
...@@ -116,6 +118,7 @@ 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 * \param b_current_next current next indicator
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_InitCAT(dvbpsi_cat_t* p_cat, void dvbpsi_InitCAT(dvbpsi_cat_t* p_cat,
uint8_t i_version, int b_current_next); uint8_t i_version, int b_current_next);
...@@ -146,6 +149,7 @@ do { \ ...@@ -146,6 +149,7 @@ do { \
* \param p_cat pointer to the CAT structure * \param p_cat pointer to the CAT structure
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_EmptyCAT(dvbpsi_cat_t* p_cat); void dvbpsi_EmptyCAT(dvbpsi_cat_t* p_cat);
/*! /*!
...@@ -176,6 +180,7 @@ do { \ ...@@ -176,6 +180,7 @@ do { \
* \param p_data descriptor's data * \param p_data descriptor's data
* \return a pointer to the added descriptor. * \return a pointer to the added descriptor.
*/ */
__attribute__((deprecated))
dvbpsi_descriptor_t* dvbpsi_CATAddDescriptor(dvbpsi_cat_t* p_cat, dvbpsi_descriptor_t* dvbpsi_CATAddDescriptor(dvbpsi_cat_t* p_cat,
uint8_t i_tag, uint8_t i_length, uint8_t i_tag, uint8_t i_length,
uint8_t* p_data); uint8_t* p_data);
...@@ -192,6 +197,7 @@ dvbpsi_descriptor_t* dvbpsi_CATAddDescriptor(dvbpsi_cat_t* p_cat, ...@@ -192,6 +197,7 @@ dvbpsi_descriptor_t* dvbpsi_CATAddDescriptor(dvbpsi_cat_t* p_cat,
* *
* Generate CAT sections based on the dvbpsi_cat_t structure. * Generate CAT sections based on the dvbpsi_cat_t structure.
*/ */
__attribute__((deprecated))
dvbpsi_psi_section_t* dvbpsi_GenCATSections(dvbpsi_cat_t* p_cat); dvbpsi_psi_section_t* dvbpsi_GenCATSections(dvbpsi_cat_t* p_cat);
......
/***************************************************************************** /*****************************************************************************
* cat_private.h: private CAT structures * cat_private.h: private CAT structures
*---------------------------------------------------------------------------- *----------------------------------------------------------------------------
* Copyright (C) 2001-2010 VideoLAN * Copyright (C) 2001-2011 VideoLAN
* $Id$ * $Id$
* *
* Authors: Johann Hanne * Authors: Johann Hanne
...@@ -55,6 +55,7 @@ typedef struct dvbpsi_cat_decoder_s ...@@ -55,6 +55,7 @@ typedef struct dvbpsi_cat_decoder_s
***************************************************************************** *****************************************************************************
* Callback for the PSI decoder. * Callback for the PSI decoder.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
void dvbpsi_GatherCATSections(dvbpsi_decoder_t* p_decoder, void dvbpsi_GatherCATSections(dvbpsi_decoder_t* p_decoder,
dvbpsi_psi_section_t* p_section); dvbpsi_psi_section_t* p_section);
...@@ -64,6 +65,7 @@ void dvbpsi_GatherCATSections(dvbpsi_decoder_t* p_decoder, ...@@ -64,6 +65,7 @@ void dvbpsi_GatherCATSections(dvbpsi_decoder_t* p_decoder,
***************************************************************************** *****************************************************************************
* CAT decoder. * CAT decoder.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
void dvbpsi_DecodeCATSections(dvbpsi_cat_t* p_cat, void dvbpsi_DecodeCATSections(dvbpsi_cat_t* p_cat,
dvbpsi_psi_section_t* p_section); dvbpsi_psi_section_t* p_section);
......
/***************************************************************************** /*****************************************************************************
* 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 $ * $Id: eit.h 88 2004-02-24 14:31:18Z sam $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * 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); ...@@ -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. * \param p_cb_data private data given in argument to the callback.
* \return 0 if everything went ok. * \return 0 if everything went ok.
*/ */
__attribute__((deprecated))
int dvbpsi_AttachEIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id, int dvbpsi_AttachEIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
uint16_t i_extension, dvbpsi_eit_callback pf_callback, uint16_t i_extension, dvbpsi_eit_callback pf_callback,
void* p_cb_data); void* p_cb_data);
...@@ -143,6 +144,7 @@ int dvbpsi_AttachEIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id, ...@@ -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. * \param i_extension Table ID extension, here service ID.
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id, void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
uint16_t i_extension); uint16_t i_extension);
...@@ -166,6 +168,7 @@ void dvbpsi_DetachEIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id, ...@@ -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 * \param i_last_table_id i_last_table_id
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_InitEIT(dvbpsi_eit_t* p_eit, uint16_t i_service_id, uint8_t i_version, 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, int b_current_next, uint16_t i_ts_id, uint16_t i_network_id,
uint8_t i_segment_last_section_number, uint8_t i_segment_last_section_number,
...@@ -198,6 +201,7 @@ do { \ ...@@ -198,6 +201,7 @@ do { \
* \param p_eit pointer to the EIT structure * \param p_eit pointer to the EIT structure
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit); void dvbpsi_EmptyEIT(dvbpsi_eit_t* p_eit);
/*! /*!
...@@ -251,6 +255,7 @@ dvbpsi_eit_event_t* dvbpsi_EITAddEvent(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 * \param p_data descriptor's data
* \return a pointer to the added descriptor. * \return a pointer to the added descriptor.
*/ */
__attribute__((deprecated))
dvbpsi_descriptor_t* dvbpsi_EITEventAddDescriptor( dvbpsi_descriptor_t* dvbpsi_EITEventAddDescriptor(
dvbpsi_eit_event_t* p_event, dvbpsi_eit_event_t* p_event,
uint8_t i_tag, uint8_t i_length, uint8_t i_tag, uint8_t i_length,
......
/***************************************************************************** /*****************************************************************************
* eit_private.h: private EIT structures * 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 $ * $Id: eit_private.h 88 2004-02-24 14:31:18Z sam $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
...@@ -55,6 +55,7 @@ typedef struct dvbpsi_eit_decoder_s ...@@ -55,6 +55,7 @@ typedef struct dvbpsi_eit_decoder_s
***************************************************************************** *****************************************************************************
* Callback for the PSI decoder. * Callback for the PSI decoder.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
void dvbpsi_GatherEITSections(dvbpsi_decoder_t* p_psi_decoder, void dvbpsi_GatherEITSections(dvbpsi_decoder_t* p_psi_decoder,
void* p_private_decoder, void* p_private_decoder,
dvbpsi_psi_section_t* p_section); dvbpsi_psi_section_t* p_section);
...@@ -65,6 +66,7 @@ void dvbpsi_GatherEITSections(dvbpsi_decoder_t* p_psi_decoder, ...@@ -65,6 +66,7 @@ void dvbpsi_GatherEITSections(dvbpsi_decoder_t* p_psi_decoder,
***************************************************************************** *****************************************************************************
* EIT decoder. * EIT decoder.
*****************************************************************************/ *****************************************************************************/
__attribute__((deprecated))
void dvbpsi_DecodeEITSections(dvbpsi_eit_t* p_eit, void dvbpsi_DecodeEITSections(dvbpsi_eit_t* p_eit,
dvbpsi_psi_section_t* p_section); dvbpsi_psi_section_t* p_section);
......
/***************************************************************************** /*****************************************************************************
* nit.h * nit.h
* Copyright (C) 2001-2010 VideoLAN * Copyright (C) 2001-2011 VideoLAN
* $Id$ * $Id$
* *
* Authors: Johann Hanne * Authors: Johann Hanne
...@@ -120,6 +120,7 @@ typedef void (* dvbpsi_nit_callback)(void* p_cb_data, dvbpsi_nit_t* p_new_nit); ...@@ -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. * \param p_cb_data private data given in argument to the callback.
* \return 0 if everything went ok. * \return 0 if everything went ok.
*/ */
__attribute__((deprecated))
int dvbpsi_AttachNIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id, int dvbpsi_AttachNIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id,
uint16_t i_extension, dvbpsi_nit_callback pf_callback, uint16_t i_extension, dvbpsi_nit_callback pf_callback,
void* p_cb_data); void* p_cb_data);
...@@ -137,6 +138,7 @@ int dvbpsi_AttachNIT(dvbpsi_decoder_t * p_psi_decoder, uint8_t i_table_id, ...@@ -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. * \param i_extension Table ID extension, here service ID.
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id, void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
uint16_t i_extension); uint16_t i_extension);
...@@ -154,6 +156,7 @@ void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id, ...@@ -154,6 +156,7 @@ void dvbpsi_DetachNIT(dvbpsi_demux_t * p_demux, uint8_t i_table_id,
* \param b_current_next current next indicator * \param b_current_next current next indicator
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_InitNIT(dvbpsi_nit_t* p_nit, uint16_t i_network_id, void dvbpsi_InitNIT(dvbpsi_nit_t* p_nit, uint16_t i_network_id,
uint8_t i_version, int b_current_next); uint8_t i_version, int b_current_next);
...@@ -186,6 +189,7 @@ do { \ ...@@ -186,6 +189,7 @@ do { \
* \param p_nit pointer to the NIT structure * \param p_nit pointer to the NIT structure
* \return nothing. * \return nothing.
*/ */
__attribute__((deprecated))
void dvbpsi_EmptyNIT(dvbpsi_nit_t* p_nit); void dvbpsi_EmptyNIT(dvbpsi_nit_t* p_nit);
/*! /*!
...@@ -216,6 +220,7 @@ do { \ ...@@ -216,6 +220,7 @@ do { \
* \param p_data descriptor's data * \param p_data descriptor's data
* \return a pointer to the added descriptor. * \return a pointer to the added descriptor.
*/ */
__attribute__((deprecated))
dvbpsi_descriptor_t* dvbpsi_NITAddDescriptor(dvbpsi_nit_t* p_nit, dvbpsi_descriptor_t* dvbpsi_NITAddDescriptor(dvbpsi_nit_t* p_nit,
uint8_t i_tag, uint8_t i_length, uint8_t i_tag, uint8_t i_length,
uint8_t* p_data); uint8_t* p_data);
...@@ -233,6 +238,7 @@ dvbpsi_descriptor_t* dvbpsi_NITAddDescriptor(dvbpsi_nit_t* p_nit, ...@@ -233,6 +238,7 @@ dvbpsi_descriptor_t* dvbpsi_NITAddDescriptor(dvbpsi_nit_t* p_nit,
* \param i_pid PID of the TS * \param i_pid PID of the TS
* \return a pointer to the added TS. * \return a pointer to the added TS.
*/ */
__attribute__((deprecated))
dvbpsi_nit_ts_t* dvbpsi_NITAddTS(dvbpsi_nit_t* p_nit, dvbpsi_nit_ts_t* dvbpsi_NITAddTS(dvbpsi_nit_t* p_nit,
uint16_t i_ts_id, uint16_t i_orig_network_id); 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, ...@@ -252,6 +258,7 @@ dvbpsi_nit_ts_t* dvbpsi_NITAddTS(dvbpsi_nit_t* p_nit,
* \param p_data descriptor's data * \param p_data descriptor's data
* \return a pointer to the added descriptor. * \return a pointer to the added descriptor.
*/ */
__attribute__((deprecated))
dvbpsi_descriptor_t* dvbpsi_NITTSAddDescriptor(dvbpsi_nit_ts_t* p_ts, dvbpsi_descriptor_t* dvbpsi_NITTSAddDescriptor(dvbpsi_nit_ts_t* p_ts,
uint8_t i_tag, uint8_t i_length, uint8_t i_tag, uint8_t i_length,
uint8_t* p_data); uint8_t* p_data);
...@@ -270,6 +277,7 @@ dvbpsi_descriptor_t* dvbpsi_NITTSAddDescriptor(dvbpsi_nit_ts_t* p_ts, ...@@ -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. * Generate NIT sections based on the dvbpsi_nit_t structure.
*/ */
__attribute__((deprecated))
dvbpsi_psi_section_t* dvbpsi_GenNITSections(dvbpsi_nit_t* p_nit, dvbpsi_psi_section_t* dvbpsi_GenNITSections(dvbpsi_nit_t* p_nit,
uint8_t i_table_id); uint8_t i_table_id);