/*****************************************************************************
* variables.c: routines for object variables handling
*****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: variables.c,v 1.33 2003/10/29 01:33:27 gbazin Exp $
+ * Copyright (C) 2002-2006 the VideoLAN team
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
int i;
vlc_list_t *p_list = malloc( sizeof(vlc_list_t) );
+ p_list->i_count = p_val->p_list->i_count;
if( p_val->p_list->i_count )
{
- p_list->i_count = p_val->p_list->i_count;
p_list->p_values = malloc( p_list->i_count * sizeof(vlc_value_t) );
p_list->pi_types = malloc( p_list->i_count * sizeof(int) );
}
+ else
+ {
+ p_list->p_values = NULL;
+ p_list->pi_types = NULL;
+ }
for( i = 0; i < p_list->i_count; i++ )
{
p_list->p_values[i] = p_val->p_list->p_values[i];
+ p_list->pi_types[i] = p_val->p_list->pi_types[i];
switch( p_val->p_list->pi_types[i] & VLC_VAR_TYPE )
{
case VLC_VAR_STRING:
-
+
DupString( &p_list->p_values[i] );
break;
default:
p_this->i_vars++;
p_var = &p_this->p_vars[i_new];
+ memset( p_var, 0, sizeof(*p_var) );
p_var->i_hash = HashString( psz_name );
p_var->psz_name = strdup( psz_name );
{
p_var->pf_free( &p_var->choices.p_values[i] );
}
- if( p_var->choices.i_count )
- free( p_var->choices.p_values );
+ for( i = 0 ; i < p_var->choices_text.i_count ; i++ )
+ {
+ if( p_var->choices_text.p_values[i].psz_string )
+ free( p_var->choices_text.p_values[i].psz_string );
+ }
+ if( p_var->choices.i_count ) free( p_var->choices.p_values );
+ if( p_var->choices_text.i_count ) free( p_var->choices_text.p_values );
p_var->choices.i_count = 0;
p_var->choices.p_values = NULL;
+ p_var->choices_text.i_count = 0;
+ p_var->choices_text.p_values = NULL;
p_var->i_default = -1;
break;
case VLC_VAR_SETDEFAULT:
break;
case VLC_VAR_FREELIST:
FreeList( p_val );
+ if( p_val2 && p_val2->p_list )
+ {
+ for( i = 0; i < p_val2->p_list->i_count; i++ )
+ if( p_val2->p_list->p_values[i].psz_string )
+ free( p_val2->p_list->p_values[i].psz_string );
+ if( p_val2->p_list->i_count )
+ {
+ free( p_val2->p_list->p_values );
+ free( p_val2->p_list->pi_types );
+ }
+ free( p_val2->p_list );
+ }
break;
case VLC_VAR_SETTEXT:
if( p_var->psz_text ) free( p_var->psz_text );
}
}
break;
+ case VLC_VAR_TRIGGER_CALLBACKS:
+ {
+ /* 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 = VLC_TRUE;
+ vlc_mutex_unlock( &p_this->var_lock );
+
+ /* The real calls */
+ for( ; i_entries-- ; )
+ {
+ p_entries[i_entries].pf_callback( p_this, psz_name, p_var->val, p_var->val,
+ p_entries[i_entries].p_data );
+ }
+
+ vlc_mutex_lock( &p_this->var_lock );
+
+ i_var = Lookup( p_this->p_vars, p_this->i_vars, psz_name );
+ if( i_var < 0 )
+ {
+ msg_Err( p_this, "variable %s has disappeared", psz_name );
+ vlc_mutex_unlock( &p_this->var_lock );
+ return VLC_ENOVAR;
+ }
+
+ p_var = &p_this->p_vars[i_var];
+ p_var->b_incallback = VLC_FALSE;
+ }
+ }
+ break;
default:
break;
return VLC_SUCCESS;
}
+/** Parse a stringified option
+ * This function parse a string option and create the associated object
+ * variable
+ * The option must be of the form "[no[-]]foo[=bar]" where foo is the
+ * option name and bar is the value of the option.
+ * \param p_obj the object in which the variable must be created
+ * \param psz_option the option to parse
+ * \return nothing
+ */
+void __var_OptionParse( vlc_object_t *p_obj, const char *psz_option )
+{
+ char *psz_name, *psz_value = strchr( psz_option, '=' );
+ int i_name_len, i_type;
+ vlc_bool_t b_isno = VLC_FALSE;
+ vlc_value_t val;
+
+ if( psz_value ) i_name_len = psz_value - psz_option;
+ else i_name_len = strlen( psz_option );
+
+ /* It's too much of an hassle to remove the ':' when we parse
+ * the cmd line :) */
+ if( i_name_len && *psz_option == ':' )
+ {
+ psz_option++;
+ i_name_len--;
+ }
+
+ if( i_name_len == 0 ) return;
+
+ psz_name = strndup( psz_option, i_name_len );
+ if( psz_value ) psz_value++;
+
+ /* FIXME: :programs should be handled generically */
+ if( !strcmp( psz_name, "programs" ) )
+ i_type = VLC_VAR_LIST;
+ else
+ i_type = config_GetType( p_obj, psz_name );
+
+ if( !i_type && !psz_value )
+ {
+ /* check for "no-foo" or "nofoo" */
+ if( !strncmp( psz_name, "no-", 3 ) )
+ {
+ memmove( psz_name, psz_name + 3, strlen(psz_name) + 1 - 3 );
+ }
+ else if( !strncmp( psz_name, "no", 2 ) )
+ {
+ memmove( psz_name, psz_name + 2, strlen(psz_name) + 1 - 2 );
+ }
+ else goto cleanup; /* Option doesn't exist */
+
+ b_isno = VLC_TRUE;
+ i_type = config_GetType( p_obj, psz_name );
+
+ if( !i_type ) goto cleanup; /* Option doesn't exist */
+ }
+ else if( !i_type ) goto cleanup; /* Option doesn't exist */
+
+ if( ( i_type != VLC_VAR_BOOL ) &&
+ ( !psz_value || !*psz_value ) ) goto cleanup; /* Invalid value */
+
+ /* 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 );
+
+ switch( i_type )
+ {
+ case VLC_VAR_BOOL:
+ val.b_bool = !b_isno;
+ break;
+
+ case VLC_VAR_INTEGER:
+ val.i_int = strtol( psz_value, NULL, 0 );
+ break;
+
+ case VLC_VAR_FLOAT:
+ val.f_float = atof( psz_value );
+ break;
+
+ case VLC_VAR_STRING:
+ case VLC_VAR_MODULE:
+ case VLC_VAR_FILE:
+ case VLC_VAR_DIRECTORY:
+ val.psz_string = psz_value;
+ break;
+
+ case VLC_VAR_LIST:
+ {
+ char *psz_orig, *psz_var;
+ vlc_list_t *p_list = malloc(sizeof(vlc_list_t));
+ val.p_list = p_list;
+ p_list->i_count = 0;
+
+ psz_var = psz_orig = strdup(psz_value);
+ while( psz_var && *psz_var )
+ {
+ char *psz_item = psz_var;
+ vlc_value_t val2;
+ while( *psz_var && *psz_var != ',' ) psz_var++;
+ if( *psz_var == ',' )
+ {
+ *psz_var = '\0';
+ psz_var++;
+ }
+ val2.i_int = strtol( psz_item, NULL, 0 );
+ INSERT_ELEM( p_list->p_values, p_list->i_count,
+ p_list->i_count, val2 );
+ /* p_list->i_count is incremented twice by INSERT_ELEM */
+ p_list->i_count--;
+ INSERT_ELEM( p_list->pi_types, p_list->i_count,
+ p_list->i_count, VLC_VAR_INTEGER );
+ }
+ if( psz_orig ) free( psz_orig );
+ break;
+ }
+
+ default:
+ goto cleanup;
+ break;
+ }
+
+ var_Set( p_obj, psz_name, val );
+
+ cleanup:
+ if( psz_name ) free( psz_name );
+ return;
+}
+
+
/* Following functions are local */
/*****************************************************************************
* This function checks p_val's value against p_var's limitations such as
* minimal and maximal value, step, in-list position, and modifies p_val if
* necessary.
- *****************************************************************************/
+ ****************************************************************************/
static void CheckValue ( variable_t *p_var, vlc_value_t *p_val )
{
/* Check that our variable is in the list */
case VLC_VAR_FILE:
case VLC_VAR_DIRECTORY:
case VLC_VAR_STRING:
+ case VLC_VAR_MODULE:
p_val->psz_string = config_GetPsz( p_this, psz_name );
if( !p_val->psz_string ) p_val->psz_string = strdup("");
break;
case VLC_VAR_BOOL:
p_val->b_bool = config_GetInt( p_this, psz_name );
break;
+ case VLC_VAR_LIST:
+ {
+ char *psz_orig, *psz_var;
+ vlc_list_t *p_list = malloc(sizeof(vlc_list_t));
+ p_val->p_list = p_list;
+ p_list->i_count = 0;
+
+ psz_var = psz_orig = config_GetPsz( p_this, psz_name );
+ while( psz_var && *psz_var )
+ {
+ char *psz_item = psz_var;
+ vlc_value_t val;
+ while( *psz_var && *psz_var != ',' ) psz_var++;
+ if( *psz_var == ',' )
+ {
+ *psz_var = '\0';
+ psz_var++;
+ }
+ val.i_int = strtol( psz_item, NULL, 0 );
+ INSERT_ELEM( p_list->p_values, p_list->i_count,
+ p_list->i_count, val );
+ /* p_list->i_count is incremented twice by INSERT_ELEM */
+ p_list->i_count--;
+ INSERT_ELEM( p_list->pi_types, p_list->i_count,
+ p_list->i_count, VLC_VAR_INTEGER );
+ }
+ if( psz_orig ) free( psz_orig );
+ break;
+ }
default:
return VLC_ENOOBJ;
break;