Commit fd907c9a 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.
parent fe3cb633
...@@ -713,6 +713,16 @@ static inline mtime_t var_InheritTime( vlc_object_t *obj, const char *name ) ...@@ -713,6 +713,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) #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_OBECT(o), n)
VLC_EXPORT( int, var_InheritURational, ( vlc_object_t *, unsigned *num, unsigned *den, const char *var ) ); VLC_EXPORT( int, var_InheritURational, ( vlc_object_t *, unsigned *num, unsigned *den, const char *var ) );
#define var_InheritURational(a,b,c,d) var_InheritURational(VLC_OBJECT(a), b, c, d) #define var_InheritURational(a,b,c,d) var_InheritURational(VLC_OBJECT(a), b, c, d)
......
...@@ -1225,6 +1225,8 @@ int var_Inherit( vlc_object_t *p_this, const char *psz_name, int i_type, ...@@ -1225,6 +1225,8 @@ int var_Inherit( vlc_object_t *p_this, const char *psz_name, int i_type,
case VLC_VAR_BOOL: case VLC_VAR_BOOL:
p_val->b_bool = config_GetInt( p_this, psz_name ); p_val->b_bool = config_GetInt( p_this, psz_name );
break; break;
case VLC_VAR_ADDRESS:
return VLC_ENOOBJ;
default: default:
msg_Warn( p_this, "Could not inherit value for var %s " msg_Warn( p_this, "Could not inherit value for var %s "
"from config. Invalid Type", psz_name ); "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