Commit 06b5fc1b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Add var_InheritAddress()

Returns NULL if the variable cannot be inherited - pointers can never
be found in the configuration.
(cherry picked from commit fd907c9abaa6304442ced84809bdb53600c922ca)

Conflicts:

	include/vlc_variables.h
	src/misc/variables.c
parent 7be7f161
......@@ -712,6 +712,16 @@ static inline mtime_t var_InheritTime( vlc_object_t *obj, const char *name )
}
#define var_InheritTime(o, n) var_InheritTime(VLC_OBJECT(o), n)
static inline void *var_InheritAddress( vlc_object_t *obj, const char *name )
{
vlc_value_t val;
if( var_Inherit( obj, name, VLC_VAR_ADDRESS, &val ) )
val.p_address = NULL;
return val.p_address;
}
#define var_InheritAddress(o, n) var_InheritAddress(VLC_OBJECT(o), n)
#define var_GetInteger(a,b) var_GetInteger( VLC_OBJECT(a),b)
#define var_GetBool(a,b) var_GetBool( VLC_OBJECT(a),b)
#define var_GetTime(a,b) var_GetTime( VLC_OBJECT(a),b)
......
......@@ -1327,6 +1327,8 @@ int var_Inherit( vlc_object_t *p_this, const char *psz_name, int i_type,
free( psz_orig );
break;
}
case VLC_VAR_ADDRESS:
return VLC_ENOOBJ;
default:
msg_Warn( p_this, "Could not inherit value for var %s "
"from config. Invalid Type", psz_name );
......
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