* vlc_variables.h: remove unused VLC_VAR_ISCONFIG define

* objects.c: some more vars command stuff

diff --git a/include/vlc_variables.h b/include/vlc_variables.h
index 05d929e71148c6fb28265430aa7a2fd700768082..3fac00d5646b2a0809db487aed1e727b0f4ad321 100644 (file)
--- a/include/vlc_variables.h
+++ b/include/vlc_variables.h
@@ -55,7 +55,6 @@
 
 #define VLC_VAR_ISLIST    0x1000
 #define VLC_VAR_ISCOMMAND 0x2000
-#define VLC_VAR_ISCONFIG  0x2000
 
 /** Creation flag */
 #define VLC_VAR_DOINHERIT 0x8000

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 318db015d109237116f2d0c853e7e0e50ba4f077..cc78ee9f66e881420591b5dc018853c806f3f82c 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -761,12 +761,14 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
 
             PrintObject( p_object, "" );
 
+            if( !p_object->i_vars )
+                printf( " `-o No variables\n" );
             for( i = 0; i < p_object->i_vars; i++ )
             {
                 variable_t *p_var = p_object->p_vars + i;
 
                 const char *psz_type = "unknown";
-                switch( p_var->i_type & 0x00ff )
+                switch( p_var->i_type & VLC_VAR_TYPE )
                 {
 #define MYCASE( type, nice )                \
                     case VLC_VAR_ ## type:  \
@@ -794,6 +796,8 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
                 if( p_var->psz_text )
                     printf( ", %s", p_var->psz_text );
                 printf( ")" );
+                if( p_var->i_type & VLC_VAR_ISCOMMAND )
+                    printf( ", command" );
                 if( p_var->i_entries )
                     printf( ", %d callbacks", p_var->i_entries );
                 switch( p_var->i_type & 0x00f0 )