X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmisc%2Fvariables.c;h=8c2ab50332401db2682e493c928f2af3de3f80c6;hb=6da55419ad36912490fce000ae5c1033a953ce10;hp=4d9ae4a46fde0cfd3ffc6e7b9d5b26d2c1b5d46b;hpb=83f9323eae1e296532046e7697ed638b9fca6561;p=vlc diff --git a/src/misc/variables.c b/src/misc/variables.c index 4d9ae4a46f..8c2ab50332 100644 --- a/src/misc/variables.c +++ b/src/misc/variables.c @@ -1,7 +1,7 @@ /***************************************************************************** * variables.c: routines for object variables handling ***************************************************************************** - * Copyright (C) 2002-2006 the VideoLAN team + * Copyright (C) 2002-2009 the VideoLAN team * $Id$ * * Authors: Samuel Hocevar @@ -33,7 +33,6 @@ #include "libvlc.h" -#include "vlc_interface.h" #include /***************************************************************************** @@ -162,6 +161,8 @@ static void CheckValue ( variable_t *, vlc_value_t * ); static int InheritValue( vlc_object_t *, const char *, vlc_value_t *, int ); +static int TriggerCallback( vlc_object_t *, variable_t **, const char *, + vlc_value_t ); /** * Initialize a vlc variable @@ -195,6 +196,8 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type ) /* If the types differ, variable creation failed. */ if( (i_type & VLC_VAR_TYPE) != (p_priv->p_vars[i_new].i_type & VLC_VAR_TYPE) ) { + msg_Err( p_this, "Variable '%s' (0x%04x) already exist but with a different type (0x%04x)", + psz_name, p_priv->p_vars[i_new].i_type, i_type ); vlc_mutex_unlock( &p_priv->var_lock ); return VLC_EBADVAR; } @@ -228,7 +231,6 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type ) p_var->psz_text = NULL; p_var->i_type = i_type & ~VLC_VAR_DOINHERIT; - memset( &p_var->val, 0, sizeof(vlc_value_t) ); p_var->i_usage = 1; @@ -661,6 +663,70 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name, return VLC_SUCCESS; } + +/** + * Perform a Get and Set on a variable + * + * \param p_this: The object that hold the variable + * \param psz_name: the name of the variable + * \param i_action: the action to perform + * \param p_val: The action parameter + * \return vlc error codes + */ +int __var_GetAndSet( vlc_object_t *p_this, const char *psz_name, int i_action, + vlc_value_t val ) +{ + int i_var; + int i_ret = VLC_SUCCESS; + variable_t *p_var; + vlc_value_t oldval; + vlc_object_internals_t *p_priv = vlc_internals( p_this ); + + vlc_mutex_lock( &p_priv->var_lock ); + i_var = GetUnused( p_this, psz_name ); + if( i_var < 0 ) + { + vlc_mutex_unlock( &p_priv->var_lock ); + return i_var; + } + + p_var = &p_priv->p_vars[i_var]; + + /* Duplicated data if needed */ + //p_var->ops->pf_dup( &val ); + + /* Backup needed stuff */ + oldval = p_var->val; + + /* depending of the action requiered */ + switch( i_action ) + { + case VLC_VAR_TOGGLE_BOOL: + assert( ( p_var->i_type & VLC_VAR_BOOL ) == VLC_VAR_BOOL ); + p_var->val.b_bool = !p_var->val.b_bool; + break; + case VLC_VAR_INTEGER_INCDEC: + assert( ( p_var->i_type & VLC_VAR_INTEGER ) == VLC_VAR_INTEGER ); + p_var->val.i_int += val.i_int; + break; + default: + vlc_mutex_unlock( &p_priv->var_lock ); + return VLC_EGENERIC; + } + + /* Check boundaries */ + CheckValue( p_var, &p_var->val ); + + /* Deal with callbacks.*/ + if( p_var->i_entries ) + i_ret = TriggerCallback( p_this, &p_var, psz_name, oldval ); + + vlc_mutex_unlock( &p_priv->var_lock ); + + return i_ret; +} + + /** * Request a variable's type * @@ -694,6 +760,7 @@ int var_SetChecked( vlc_object_t *p_this, const char *psz_name, int expected_type, vlc_value_t val ) { int i_var; + int i_ret = VLC_SUCCESS; variable_t *p_var; vlc_value_t oldval; vlc_object_internals_t *p_priv = vlc_internals( p_this ); @@ -708,7 +775,7 @@ int var_SetChecked( vlc_object_t *p_this, const char *psz_name, } p_var = &p_priv->p_vars[i_var]; - assert( (p_var->i_type & VLC_VAR_CLASS) == 0 || expected_type == 0 || + assert( expected_type == 0 || (p_var->i_type & VLC_VAR_CLASS) == expected_type ); /* Duplicate data if needed */ @@ -723,45 +790,16 @@ int var_SetChecked( vlc_object_t *p_this, const char *psz_name, /* Set the variable */ p_var->val = val; - /* Deal with callbacks. Tell we're in a callback, release the lock, - * call stored functions, retake the lock. */ + /* Deal with callbacks */ if( p_var->i_entries ) - { - int i_var; - int i_entries = p_var->i_entries; - callback_entry_t *p_entries = p_var->p_entries; - - p_var->b_incallback = true; - vlc_mutex_unlock( &p_priv->var_lock ); - - /* The real calls */ - for( ; i_entries-- ; ) - { - p_entries[i_entries].pf_callback( p_this, psz_name, oldval, val, - p_entries[i_entries].p_data ); - } - - vlc_mutex_lock( &p_priv->var_lock ); - - i_var = Lookup( p_priv->p_vars, p_priv->i_vars, psz_name ); - if( i_var < 0 ) - { - msg_Err( p_this, "variable %s has disappeared", psz_name ); - vlc_mutex_unlock( &p_priv->var_lock ); - return VLC_ENOVAR; - } - - p_var = &p_priv->p_vars[i_var]; - p_var->b_incallback = false; - vlc_cond_broadcast( &p_priv->var_wait ); - } + i_ret = TriggerCallback( p_this, &p_var, psz_name, oldval ); /* Free data if needed */ p_var->ops->pf_free( &oldval ); vlc_mutex_unlock( &p_priv->var_lock ); - return VLC_SUCCESS; + return i_ret; } @@ -790,12 +828,18 @@ int var_GetChecked( vlc_object_t *p_this, const char *psz_name, { variable_t *p_var = &p_priv->p_vars[i_var]; - assert( (p_var->i_type & VLC_VAR_CLASS) == 0 || expected_type == 0 || + assert( expected_type == 0 || (p_var->i_type & VLC_VAR_CLASS) == expected_type ); /* Really get the variable */ *p_val = p_var->val; +#ifndef NDEBUG + /* Alert if the type is VLC_VAR_VOID */ + if( ( p_var->i_type & VLC_VAR_TYPE ) == VLC_VAR_VOID ) + msg_Warn( p_this, "Calling var_GetVoid on the void variable '%s' (0x%04x)", psz_name, p_var->i_type ); +#endif + /* Duplicate value if needed */ p_var->ops->pf_dup( p_val ); } @@ -898,6 +942,13 @@ int __var_DelCallback( vlc_object_t *p_this, const char *psz_name, { break; } +#ifndef NDEBUG + else if( p_var->p_entries[i_entry].pf_callback == pf_callback ) + { + msg_Warn( p_this, "Calling var_DelCallback for '%s' with the same " + "function but not the same data.", psz_name ); + } +#endif } if( i_entry < 0 ) @@ -922,8 +973,8 @@ int __var_DelCallback( vlc_object_t *p_this, const char *psz_name, int __var_TriggerCallback( vlc_object_t *p_this, const char *psz_name ) { int i_var; + int i_ret = VLC_SUCCESS; variable_t *p_var; - vlc_value_t oldval; vlc_object_internals_t *p_priv = vlc_internals( p_this ); vlc_mutex_lock( &p_priv->var_lock ); @@ -937,44 +988,13 @@ int __var_TriggerCallback( vlc_object_t *p_this, const char *psz_name ) p_var = &p_priv->p_vars[i_var]; - /* Backup needed stuff */ - oldval = p_var->val; - /* Deal with callbacks. Tell we're in a callback, release the lock, * call stored functions, retake the lock. */ if( p_var->i_entries ) - { - int i_var; - int i_entries = p_var->i_entries; - callback_entry_t *p_entries = p_var->p_entries; - - p_var->b_incallback = true; - vlc_mutex_unlock( &p_priv->var_lock ); - - /* The real calls */ - for( ; i_entries-- ; ) - { - p_entries[i_entries].pf_callback( p_this, psz_name, oldval, oldval, - p_entries[i_entries].p_data ); - } - - vlc_mutex_lock( &p_priv->var_lock ); - - i_var = Lookup( p_priv->p_vars, p_priv->i_vars, psz_name ); - if( i_var < 0 ) - { - msg_Err( p_this, "variable %s has disappeared", psz_name ); - vlc_mutex_unlock( &p_priv->var_lock ); - return VLC_ENOVAR; - } - - p_var = &p_priv->p_vars[i_var]; - p_var->b_incallback = false; - vlc_cond_broadcast( &p_priv->var_wait ); - } + i_ret = TriggerCallback( p_this, &p_var, psz_name, p_var->val ); vlc_mutex_unlock( &p_priv->var_lock ); - return VLC_SUCCESS; + return i_ret; } /** Parse a stringified option @@ -1056,7 +1076,7 @@ void var_OptionParse( vlc_object_t *p_obj, const char *psz_option, /* Create the variable in the input object. * Children of the input object will be able to retreive this value * thanks to the inheritance property of the object variables. */ - var_Create( p_obj, psz_name, i_type ); + __var_Create( p_obj, psz_name, i_type ); switch( i_type ) { @@ -1113,7 +1133,7 @@ void var_OptionParse( vlc_object_t *p_obj, const char *psz_option, goto cleanup; } - var_Set( p_obj, psz_name, val ); + __var_Set( p_obj, psz_name, val ); /* If that's a list, remove all elements allocated */ if( i_type == VLC_VAR_LIST ) @@ -1296,7 +1316,7 @@ static void CheckValue ( variable_t *p_var, vlc_value_t *p_val ) { int i; - /* FIXME: the list is sorted, dude. Use something cleverer. */ + /* This list is not sorted so go throug it (this is a small list) */ for( i = p_var->choices.i_count ; i-- ; ) { if( p_var->ops->pf_cmp( *p_val, p_var->choices.p_values[i] ) == 0 ) @@ -1464,6 +1484,47 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name, return VLC_SUCCESS; } + +/********************************************************************** + * Trigger the callbacks. + * Tell we're in a callback, release the lock, call stored functions, + * retake the lock. + **********************************************************************/ +static int TriggerCallback( vlc_object_t *p_this, variable_t **pp_var, + const char *psz_name, vlc_value_t oldval ) +{ + int i_var; + int i_entries = (*pp_var)->i_entries; + callback_entry_t *p_entries = (*pp_var)->p_entries; + vlc_object_internals_t *p_priv = vlc_internals( p_this ); + + (*pp_var)->b_incallback = true; + vlc_mutex_unlock( &p_priv->var_lock ); + + /* The real calls */ + for( ; i_entries-- ; ) + { + p_entries[i_entries].pf_callback( p_this, psz_name, oldval, (*pp_var)->val, + p_entries[i_entries].p_data ); + } + + vlc_mutex_lock( &p_priv->var_lock ); + + i_var = Lookup( p_priv->p_vars, p_priv->i_vars, psz_name ); + if( i_var < 0 ) + { + msg_Err( p_this, "variable %s has disappeared", psz_name ); + return VLC_ENOVAR; + } + + *pp_var = &p_priv->p_vars[i_var]; + (*pp_var)->b_incallback = false; + vlc_cond_broadcast( &p_priv->var_wait ); + + return VLC_SUCCESS; +} + + /********************************************************************** * Execute a var command on an object identified by its name **********************************************************************/