Commit 3a57140d authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

variables: Don't sort the choice list here. Because, the algo is bad and...

variables: Don't sort the choice list here. Because, the algo is bad and because we can't set the order of the list ourselves then.
parent ad868bfe
...@@ -473,22 +473,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name, ...@@ -473,22 +473,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name,
} }
break; break;
case VLC_VAR_ADDCHOICE: case VLC_VAR_ADDCHOICE:
/* FIXME: the list is sorted, dude. Use something cleverer. */ i = p_var->choices.i_count;
for( i = p_var->choices.i_count ; i-- ; )
{
if( p_var->pf_cmp( p_var->choices.p_values[i], *p_val ) < 0 )
{
break;
}
}
/* The new place is i+1 */
i++;
if( p_var->i_default >= i )
{
p_var->i_default++;
}
INSERT_ELEM( p_var->choices.p_values, p_var->choices.i_count, INSERT_ELEM( p_var->choices.p_values, p_var->choices.i_count,
i, *p_val ); i, *p_val );
...@@ -502,7 +487,6 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name, ...@@ -502,7 +487,6 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name,
CheckValue( p_var, &p_var->val ); CheckValue( p_var, &p_var->val );
break; break;
case VLC_VAR_DELCHOICE: case VLC_VAR_DELCHOICE:
/* FIXME: the list is sorted, dude. Use something cleverer. */
for( i = 0 ; i < p_var->choices.i_count ; i++ ) for( i = 0 ; i < p_var->choices.i_count ; i++ )
{ {
if( p_var->pf_cmp( p_var->choices.p_values[i], *p_val ) == 0 ) if( p_var->pf_cmp( p_var->choices.p_values[i], *p_val ) == 0 )
......
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