From 8d5ae441744e5613dd1f163ebc6820a31979889b Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 5 Oct 2008 16:18:35 +0300 Subject: [PATCH] Another useless parameter --- include/vlc_modules.h | 9 --------- src/libvlc.h | 10 +++++++++- src/libvlccore.sym | 1 - src/modules/modules.c | 6 ++---- src/playlist/services_discovery.c | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/include/vlc_modules.h b/include/vlc_modules.h index bd00200213..867fbf2c4f 100644 --- a/include/vlc_modules.h +++ b/include/vlc_modules.h @@ -45,15 +45,6 @@ VLC_EXPORT( void, module_release, (module_t *module) ); VLC_EXPORT( void, module_list_free, (module_t **) ); VLC_EXPORT( module_t **, module_list_get, (size_t *n) ); -/* Return a NULL terminated array with the names of the modules that have a - * certain capability. - * Free after uses both the string and the table. */ - #define module_GetModulesNamesForCapability(a,b,c) \ - __module_GetModulesNamesForCapability(VLC_OBJECT(a),b,c) -VLC_EXPORT(char **, __module_GetModulesNamesForCapability, - ( vlc_object_t *p_this, const char * psz_capability, - char ***psz_longname ) ); - VLC_EXPORT( bool, module_provides, ( const module_t *m, const char *cap ) ); VLC_EXPORT( const char *, module_get_object, ( const module_t *m ) ); VLC_EXPORT( const char *, module_get_name, ( const module_t *m, bool long_name ) ); diff --git a/src/libvlc.h b/src/libvlc.h index cc3bed0bfe..14b128e953 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -140,9 +140,17 @@ __vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type, #define vlc_custom_create(o, s, t, n) \ __vlc_custom_create(VLC_OBJECT(o), s, t, n) - +/* + * To be cleaned-up module stuff: + */ extern char *psz_vlcpath; +/* Return a NULL terminated array with the names of the modules that have a + * certain capability. + * Free after uses both the string and the table. */ +VLC_EXPORT(char **, module_GetModulesNamesForCapability, + ( const char * psz_capability, char ***psz_longname ) ); + #ifdef LIBVLC_USE_PTHREAD # include /* TODO: get rid of vlc_thread_ready and this */ #endif diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 7f050db84a..4144582009 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -210,7 +210,6 @@ module_config_get module_exists module_find module_get_help -__module_GetModulesNamesForCapability module_get_name module_get_object module_hold diff --git a/src/modules/modules.c b/src/modules/modules.c index c978a3b3f5..33c335deea 100644 --- a/src/modules/modules.c +++ b/src/modules/modules.c @@ -706,15 +706,13 @@ bool module_exists (const char * psz_name) * Return a NULL terminated array with the names of the modules * that have a certain capability. * Free after uses both the string and the table. - * \param p_this vlc object structure * \param psz_capability the capability asked * \param pppsz_longname an pointer to an array of string to contain the long names of the modules. If set to NULL the function don't use it. * \return the NULL terminated array */ -char ** __module_GetModulesNamesForCapability( vlc_object_t *p_this, - const char *psz_capability, - char ***pppsz_longname ) +char ** module_GetModulesNamesForCapability( const char *psz_capability, + char ***pppsz_longname ) { size_t count = 0; char **psz_ret; diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c index bb6ebacf72..91d0d82b16 100644 --- a/src/playlist/services_discovery.c +++ b/src/playlist/services_discovery.c @@ -47,7 +47,7 @@ static void services_discovery_Destructor ( services_discovery_t * p_sd ); char ** __services_discovery_GetServicesNames( vlc_object_t * p_super, char ***pppsz_longnames ) { - return module_GetModulesNamesForCapability( p_super, "services_discovery", + return module_GetModulesNamesForCapability( "services_discovery", pppsz_longnames ); } -- 2.39.2