From f5a761654c8a9bf850a885280cbd2e24fb857000 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 23 Dec 2009 21:16:57 +0200 Subject: [PATCH] Revert "No need to show service probes in the module list" This reverts commit b2ee1bcfbc8ebbf08c816bb6b18b1e321b7723bb. This is an ugly and confusing hack. --- src/libvlc.c | 62 ++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 33 deletions(-) diff --git a/src/libvlc.c b/src/libvlc.c index e35062f299..53b77470bd 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -1929,45 +1929,41 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) /* Enumerate each module */ for (size_t j = 0; (p_parser = list[j]) != NULL; j++) { - if( !( p_parser->psz_capability && - !strcmp( p_parser->psz_capability, "services probe" ) ) ) - { - if( b_color ) - utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY, - p_parser->psz_object_name, - _( p_parser->psz_longname ) ); - else - utf8_fprintf( stdout, " %-22s %s\n", - p_parser->psz_object_name, - _( p_parser->psz_longname ) ); + if( b_color ) + utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY, + p_parser->psz_object_name, + _( p_parser->psz_longname ) ); + else + utf8_fprintf( stdout, " %-22s %s\n", + p_parser->psz_object_name, + _( p_parser->psz_longname ) ); - if( b_verbose ) + if( b_verbose ) + { + char *const *pp_shortcut = p_parser->pp_shortcuts; + while( *pp_shortcut ) { - char *const *pp_shortcut = p_parser->pp_shortcuts; - while( *pp_shortcut ) - { - if( strcmp( *pp_shortcut, p_parser->psz_object_name ) ) - { - if( b_color ) - utf8_fprintf( stdout, CYAN" s %s\n"GRAY, - *pp_shortcut ); - else - utf8_fprintf( stdout, " s %s\n", - *pp_shortcut ); - } - pp_shortcut++; - } - if( p_parser->psz_capability ) + if( strcmp( *pp_shortcut, p_parser->psz_object_name ) ) { if( b_color ) - utf8_fprintf( stdout, MAGENTA" c %s (%d)\n"GRAY, - p_parser->psz_capability, - p_parser->i_score ); + utf8_fprintf( stdout, CYAN" s %s\n"GRAY, + *pp_shortcut ); else - utf8_fprintf( stdout, " c %s (%d)\n", - p_parser->psz_capability, - p_parser->i_score ); + utf8_fprintf( stdout, " s %s\n", + *pp_shortcut ); } + pp_shortcut++; + } + if( p_parser->psz_capability ) + { + if( b_color ) + utf8_fprintf( stdout, MAGENTA" c %s (%d)\n"GRAY, + p_parser->psz_capability, + p_parser->i_score ); + else + utf8_fprintf( stdout, " c %s (%d)\n", + p_parser->psz_capability, + p_parser->i_score ); } } } -- 2.39.2