Changeset 31013e299b7a9deeef36bbc9c9ead08fc9cfdcda

Show
Ignore:
Timestamp:
15/05/08 20:25:39 (5 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1210875939 +0300
git-parent:

[9f3e27c502acc7963224888a9df1bc8b64c4ad22]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1210875939 +0300
Message:

Remove a bunch of unused deprecated APIs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • include/vlc/deprecated.h

    raf5905c r31013e2  
    299299VLC_DEPRECATED_API char const * VLC_Changeset ( void ); 
    300300 
    301 /** 
    302  * Return an error string 
    303  * 
    304  * \param i_err an error code 
    305  * \return an error string 
    306  */ 
    307 VLC_DEPRECATED_API char const * VLC_Error ( int i_err ); 
    308  
    309301#endif /* __LIBVLC__ */ 
    310  
    311 /** 
    312  * Initialize libvlc 
    313  * 
    314  * This function allocates a vlc_t structure and returns a negative value 
    315  * in case of failure. Also, the thread system is initialized 
    316  * 
    317  * \return vlc object id or an error code 
    318  */ 
    319 VLC_DEPRECATED_API int     VLC_Create( void ); 
    320  
    321 /** 
    322  * Initialize a vlc_t structure 
    323  * 
    324  * This function initializes a previously allocated vlc_t structure: 
    325  *  - CPU detection 
    326  *  - gettext initialization 
    327  *  - message queue, module bank and playlist initialization 
    328  *  - configuration and commandline parsing 
    329  * 
    330  *  \param i_object a vlc object id 
    331  *  \param i_argc the number of arguments 
    332  *  \param ppsz_argv an array of arguments 
    333  *  \return VLC_SUCCESS on success 
    334  */ 
    335 VLC_DEPRECATED_API int     VLC_Init( int, int, const char *[] ); 
    336  
    337 /** 
    338  * Add an interface 
    339  * 
    340  * This function opens an interface plugin and runs it. If b_block is set 
    341  * to 0, VLC_AddIntf will return immediately and let the interface run in a 
    342  * separate thread. If b_block is set to 1, VLC_AddIntf will continue until 
    343  * user requests to quit. 
    344  * 
    345  * \param i_object a vlc object id 
    346  * \param psz_module a vlc module name of an interface 
    347  * \param b_block make this interface blocking 
    348  * \param b_play start playing when the interface is done loading 
    349  * \return VLC_SUCCESS on success 
    350  */ 
    351 VLC_DEPRECATED_API int     VLC_AddIntf( int, char const *, bool, bool ); 
    352  
    353 /** 
    354  * Ask vlc to die 
    355  * 
    356  * This function sets p_libvlc->b_die to true, but does not do any other 
    357  * task. It is your duty to call VLC_CleanUp and VLC_Destroy afterwards. 
    358  * 
    359  * \param i_object a vlc object id 
    360  * \return VLC_SUCCESS on success 
    361  */ 
    362 VLC_DEPRECATED_API int     VLC_Die( int ); 
    363  
    364 /** 
    365  * Clean up all the intf, playlist, vout and aout 
    366  * 
    367  * This function requests all intf, playlist, vout and aout objects to finish 
    368  * and CleanUp. Only a blank VLC object should remain after this. 
    369  * 
    370  * \note This function was previously called VLC_Stop 
    371  * 
    372  * \param i_object a vlc object id 
    373  * \return VLC_SUCCESS on success 
    374  */ 
    375 VLC_DEPRECATED_API int     VLC_CleanUp( int ); 
    376  
    377 /** 
    378  * Destroy all threads and the VLC object 
    379  * 
    380  * This function requests the running threads to finish, waits for their 
    381  * termination, and destroys their structure. 
    382  * Then it will de-init all VLC object initializations. 
    383  * 
    384  * \param i_object a vlc object id 
    385  * \return VLC_SUCCESS on success 
    386  */ 
    387 VLC_DEPRECATED_API int     VLC_Destroy( int ); 
    388302 
    389303/** 

  • src/libvlc.c

    r1287a64 r31013e2  
    8181} 
    8282 
    83 /***************************************************************************** 
    84  * VLC_Error: strerror() equivalent 
    85  ***************************************************************************** 
    86  * This function returns full version string (numeric version and codename). 
    87  *****************************************************************************/ 
    88 char const * VLC_Error( int i_err ) 
    89 { 
    90     return vlc_error( i_err ); 
    91 } 
    92  
    93 /***************************************************************************** 
    94  * VLC_Create: allocate a libvlc instance and intialize global libvlc stuff if needed 
    95  ***************************************************************************** 
    96  * This function allocates a libvlc instance and returns a negative value 
    97  * in case of failure. Also, the thread system is initialized. 
    98  *****************************************************************************/ 
    99 int VLC_Create( void ) 
    100 { 
    101     libvlc_int_t *p_object = libvlc_InternalCreate(); 
    102     if( p_object ) return p_object->i_object_id; 
    103     return VLC_ENOOBJ; 
    104 } 
    105  
    10683#define LIBVLC_FUNC \ 
    10784    libvlc_int_t * p_libvlc = vlc_current_object( i_object ); \ 
    …… 
    11087    if( i_object ) vlc_object_release( p_libvlc ); 
    11188 
    112  
    113 /***************************************************************************** 
    114  * VLC_Init: initialize a libvlc instance 
    115  ***************************************************************************** 
    116  * This function initializes a previously allocated libvlc instance: 
    117  *  - CPU detection 
    118  *  - gettext initialization 
    119  *  - message queue, module bank and playlist initialization 
    120  *  - configuration and commandline parsing 
    121  *****************************************************************************/ 
    122 int VLC_Init( int i_object, int i_argc, const char *ppsz_argv[] ) 
    123 { 
    124     int i_ret; 
    125     LIBVLC_FUNC; 
    126     i_ret = libvlc_InternalInit( p_libvlc, i_argc, ppsz_argv ); 
    127     LIBVLC_FUNC_END; 
    128     return i_ret; 
    129 } 
    130  
    131 /***************************************************************************** 
    132  * VLC_AddIntf: add an interface 
    133  ***************************************************************************** 
    134  * This function opens an interface plugin and runs it. If b_block is set 
    135  * to 0, VLC_AddIntf will return immediately and let the interface run in a 
    136  * separate thread. If b_block is set to 1, VLC_AddIntf will continue until 
    137  * user requests to quit. If b_play is set to 1, VLC_AddIntf will start playing 
    138  * the playlist when it is completely initialised. 
    139  *****************************************************************************/ 
    140 int VLC_AddIntf( int i_object, char const *psz_module, 
    141                  bool b_block, bool b_play ) 
    142 { 
    143     int i_ret; 
    144     LIBVLC_FUNC; 
    145     i_ret = libvlc_InternalAddIntf( p_libvlc, psz_module, b_block, b_play, 
    146                                     0, NULL ); 
    147     LIBVLC_FUNC_END; 
    148     return i_ret; 
    149 } 
    150  
    151  
    152 /***************************************************************************** 
    153  * VLC_Die: ask vlc to die. 
    154  ***************************************************************************** 
    155  * This function sets p_libvlc->b_die to true, but does not do any other 
    156  * task. It is your duty to call VLC_CleanUp and VLC_Destroy afterwards. 
    157  *****************************************************************************/ 
    158 int VLC_Die( int i_object ) 
    159 { 
    160     LIBVLC_FUNC; 
    161     vlc_object_kill( p_libvlc ); 
    162     LIBVLC_FUNC_END; 
    163     return VLC_SUCCESS; 
    164 } 
    165  
    166 /***************************************************************************** 
    167  * VLC_CleanUp: CleanUp all the intf, playlist, vout, aout 
    168  *****************************************************************************/ 
    169 int VLC_CleanUp( int i_object ) 
    170 { 
    171     int i_ret; 
    172     LIBVLC_FUNC; 
    173     i_ret = libvlc_InternalCleanup( p_libvlc ); 
    174     LIBVLC_FUNC_END; 
    175     return i_ret; 
    176 } 
    177  
    178 /***************************************************************************** 
    179  * VLC_Destroy: Destroy everything. 
    180  ***************************************************************************** 
    181  * This function requests the running threads to finish, waits for their 
    182  * termination, and destroys their structure. 
    183  *****************************************************************************/ 
    184 int VLC_Destroy( int i_object ) 
    185 { 
    186     LIBVLC_FUNC; 
    187     return libvlc_InternalDestroy( p_libvlc, i_object ? true : false ); 
    188 } 
    18989 
    19090/*****************************************************************************