Commit 696f7c1d authored by Antoine Cellerier's avatar Antoine Cellerier

* vlc_variables.h: remove unused VLC_VAR_ISCONFIG define

* objects.c: some more vars command stuff
parent 45956533
...@@ -55,7 +55,6 @@ ...@@ -55,7 +55,6 @@
#define VLC_VAR_ISLIST 0x1000 #define VLC_VAR_ISLIST 0x1000
#define VLC_VAR_ISCOMMAND 0x2000 #define VLC_VAR_ISCOMMAND 0x2000
#define VLC_VAR_ISCONFIG 0x2000
/** Creation flag */ /** Creation flag */
#define VLC_VAR_DOINHERIT 0x8000 #define VLC_VAR_DOINHERIT 0x8000
......
...@@ -761,12 +761,14 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, ...@@ -761,12 +761,14 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
PrintObject( p_object, "" ); PrintObject( p_object, "" );
if( !p_object->i_vars )
printf( " `-o No variables\n" );
for( i = 0; i < p_object->i_vars; i++ ) for( i = 0; i < p_object->i_vars; i++ )
{ {
variable_t *p_var = p_object->p_vars + i; variable_t *p_var = p_object->p_vars + i;
const char *psz_type = "unknown"; const char *psz_type = "unknown";
switch( p_var->i_type & 0x00ff ) switch( p_var->i_type & VLC_VAR_TYPE )
{ {
#define MYCASE( type, nice ) \ #define MYCASE( type, nice ) \
case VLC_VAR_ ## type: \ case VLC_VAR_ ## type: \
...@@ -794,6 +796,8 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd, ...@@ -794,6 +796,8 @@ static int DumpCommand( vlc_object_t *p_this, char const *psz_cmd,
if( p_var->psz_text ) if( p_var->psz_text )
printf( ", %s", p_var->psz_text ); printf( ", %s", p_var->psz_text );
printf( ")" ); printf( ")" );
if( p_var->i_type & VLC_VAR_ISCOMMAND )
printf( ", command" );
if( p_var->i_entries ) if( p_var->i_entries )
printf( ", %d callbacks", p_var->i_entries ); printf( ", %d callbacks", p_var->i_entries );
switch( p_var->i_type & 0x00f0 ) switch( p_var->i_type & 0x00f0 )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment