From c3102ca43decae519f8d0a5effb5012a0d49bd0c Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 4 Aug 2007 17:42:42 +0000 Subject: [PATCH 1/1] Use module_* functions --- modules/control/http/mvar.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/control/http/mvar.c b/modules/control/http/mvar.c index 518b878a33..748a5884e5 100644 --- a/modules/control/http/mvar.c +++ b/modules/control/http/mvar.c @@ -346,13 +346,11 @@ mvar_t *E_(mvar_ObjectSetNew)( intf_thread_t *p_intf, char *psz_name, for( i = 0; i < p_list->i_count; i++ ) { module_t *p_parser = (module_t *)p_list->p_values[i].p_object; - if( !strcmp( p_parser->psz_capability, psz_capability ) ) + if( module_IsCapable( p_parser, psz_capability ) ) { - mvar_t *sd = E_(mvar_New)( "sd", p_parser->psz_object_name ); + mvar_t *sd = E_(mvar_New)( "sd", module_GetObjName( p_parser ) ); E_(mvar_AppendNewVar)( sd, "name", - p_parser->psz_longname ? p_parser->psz_longname - : ( p_parser->psz_shortname ? p_parser->psz_shortname - : p_parser->psz_object_name ) ); + module_GetName( p_parser, VLC_TRUE ) ); E_(mvar_AppendVar)( s, sd ); } } -- 2.39.2