for( int i = 0; i < i_count; i++ )
{
lua_pushinteger( L, i+1 );
- if( !vlclua_pushvalue( L, p_list->pi_types[i],
- p_list->p_values[i], true ) )
+ if( !vlclua_pushvalue( L, p_list->i_type, p_list->p_values[i], true ) )
lua_pushnil( L );
lua_settable( L, -3 );
}
int i;
for( i = 0; i < p_val->p_list->i_count; i++ )
{
- switch( p_val->p_list->pi_types[i] & VLC_VAR_CLASS )
+ switch( p_val->p_list->i_type & VLC_VAR_CLASS )
{
case VLC_VAR_STRING:
FreeString( &p_val->p_list->p_values[i] );
}
if( p_val->p_list->i_count )
- {
free( p_val->p_list->p_values );
- free( p_val->p_list->pi_types );
- }
free( p_val->p_list );
}
{
p_val->p_list->p_values = malloc( p_var->choices.i_count
* sizeof(vlc_value_t) );
- p_val->p_list->pi_types = malloc( p_var->choices.i_count
- * sizeof(int) );
if( p_val2 )
{
p_val2->p_list->p_values =
malloc( p_var->choices.i_count * sizeof(vlc_value_t) );
- p_val2->p_list->pi_types =
- malloc( p_var->choices.i_count * sizeof(int) );
}
}
+ p_val->p_list->i_type = p_var->i_type;
p_val->p_list->i_count = p_var->choices.i_count;
- if( p_val2 ) p_val2->p_list->i_count = p_var->choices.i_count;
+ if( p_val2 )
+ {
+ p_val2->p_list->i_type = VLC_VAR_STRING;
+ p_val2->p_list->i_count = p_var->choices.i_count;
+ }
for( int i = 0 ; i < p_var->choices.i_count ; i++ )
{
p_val->p_list->p_values[i] = p_var->choices.p_values[i];
- p_val->p_list->pi_types[i] = p_var->i_type;
p_var->ops->pf_dup( &p_val->p_list->p_values[i] );
if( p_val2 )
{
p_val2->p_list->p_values[i].psz_string =
p_var->choices_text.p_values[i].psz_string ?
strdup(p_var->choices_text.p_values[i].psz_string) : NULL;
- p_val2->p_list->pi_types[i] = VLC_VAR_STRING;
}
}
break;
for( int i = 0; i < p_val2->p_list->i_count; i++ )
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 );
}
}