Commit edf32d6b authored by basos G's avatar basos G Committed by Laurent Aimar

Variable inheritance hints

Added a comment to describe inheritable variables
Added debug messages to get clues about variable
inheritance final source
Signed-off-by: default avatarLaurent Aimar <fenrir@videolan.org>
parent 05c8ebc5
...@@ -61,6 +61,8 @@ ...@@ -61,6 +61,8 @@
#define VLC_VAR_ISCOMMAND 0x2000 #define VLC_VAR_ISCOMMAND 0x2000
/** Creation flag */ /** Creation flag */
/* If the variable is not found on the current module
search all parents and finally module config until found */
#define VLC_VAR_DOINHERIT 0x8000 #define VLC_VAR_DOINHERIT 0x8000
/**@}*/ /**@}*/
......
...@@ -1384,7 +1384,7 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name, ...@@ -1384,7 +1384,7 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
int i_var; int i_var;
variable_t *p_var; variable_t *p_var;
if( p_this->p_parent || ( p_this->p_libvlc && p_this != p_this->p_libvlc ) ) if( p_this->p_parent || ( p_this->p_libvlc && p_this != (vlc_object_t*) p_this->p_libvlc ) )
{ {
vlc_object_internals_t *p_priv; vlc_object_internals_t *p_priv;
...@@ -1406,6 +1406,8 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name, ...@@ -1406,6 +1406,8 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
/* Duplicate value if needed */ /* Duplicate value if needed */
p_var->ops->pf_dup( p_val ); p_var->ops->pf_dup( p_val );
msg_Dbg( p_this, "Inherited value for var %s from object %s", psz_name ? : "(null)",
p_this->psz_object_name ? : "(Unknown)" ) ;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
else if ( p_this->p_parent ) /* We are still not there */ else if ( p_this->p_parent ) /* We are still not there */
...@@ -1460,9 +1462,11 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name, ...@@ -1460,9 +1462,11 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
break; break;
} }
default: default:
msg_Warn( p_this, "Could not inherit value for var %s from config. Invalid Type", psz_name ) ;
return VLC_ENOOBJ; return VLC_ENOOBJ;
break; break;
} }
msg_Dbg( p_this, "Inherited value for var %s from config", psz_name ) ;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
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