# include <search.h>
#endif
#include <assert.h>
+#include <float.h>
#include <math.h>
#include <limits.h>
#ifdef __GLIBC__
*****************************************************************************/
struct callback_entry_t
{
- vlc_callback_t pf_callback;
+ union
+ {
+ vlc_callback_t pf_value_callback;
+ vlc_list_callback_t pf_list_callback;
+ void * p_callback;
+ } u;
void * p_data;
};
static void FreeDummy( vlc_value_t *p_val ) { (void)p_val; /* unused */ }
static void FreeString( vlc_value_t *p_val ) { free( p_val->psz_string ); }
-static void FreeList( vlc_value_t *p_val )
-{
- int i;
- for( i = 0; i < p_val->p_list->i_count; i++ )
- {
- switch( p_val->p_list->pi_types[i] & VLC_VAR_CLASS )
- {
- case VLC_VAR_STRING:
- FreeString( &p_val->p_list->p_values[i] );
- break;
- default:
- break;
- }
- }
-
- 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 );
-}
-
static const struct variable_ops_t
void_ops = { NULL, DupDummy, FreeDummy, },
addr_ops = { CmpAddress, DupDummy, FreeDummy, },
static int TriggerCallback( vlc_object_t *, variable_t *, const char *,
vlc_value_t );
+static int TriggerListCallback( vlc_object_t *, variable_t *,
+ const char *, int,
+ vlc_value_t * );
+
static int varcmp( const void *a, const void *b )
{
const variable_t *va = a, *vb = b;
free( p_var->choices_text.p_values );
}
#if 0 // ndef NDEBUG
- for (int i = 0; i < p_var->i_entries; i++)
+ callback_table_t *p_table = &p_var->value_callbacks;
+ for (int i = 0; i < p_table->i_entries; i++)
{
const char *file = "?", *symbol = "?";
- const void *addr = p_var->p_entries[i].pf_callback;
+ const void *addr = p_table->p_entries[i].pf_callback;
# ifdef __GLIBC__
Dl_info info;
free( p_var->psz_name );
free( p_var->psz_text );
- free( p_var->p_entries );
+ free( p_var->value_callbacks.p_entries );
free( p_var );
}
p_var->choices_text.p_values = NULL;
p_var->b_incallback = false;
- p_var->i_entries = 0;
- p_var->p_entries = NULL;
+ p_var->value_callbacks = (callback_table_t){ 0 };
/* Always initialize the variable, even if it is a list variable; this
* will lead to errors if the variable is not initialized, but it will
strdup( p_val2->psz_string ) : NULL;
CheckValue( p_var, &p_var->val );
+
+ TriggerListCallback(p_this, p_var, psz_name, VLC_VAR_ADDCHOICE, p_val);
break;
}
case VLC_VAR_DELCHOICE:
p_var->choices_text.i_count, i );
CheckValue( p_var, &p_var->val );
+
+ TriggerListCallback(p_this, p_var, psz_name, VLC_VAR_DELCHOICE, p_val);
break;
}
case VLC_VAR_CHOICESCOUNT:
p_var->choices_text.i_count = 0;
p_var->choices_text.p_values = NULL;
p_var->i_default = -1;
+ TriggerListCallback(p_this, p_var, psz_name, VLC_VAR_CLEARCHOICES, NULL);
break;
case VLC_VAR_SETDEFAULT:
{
p_var->ops->pf_free( &oldval );
break;
case VLC_VAR_GETCHOICES:
- case VLC_VAR_GETLIST:
- p_val->p_list = malloc( sizeof(vlc_list_t) );
- if( p_val2 ) p_val2->p_list = malloc( sizeof(vlc_list_t) );
- if( p_var->choices.i_count )
+ p_val->p_list = xmalloc( sizeof(vlc_list_t) );
+ p_val->p_list->p_values =
+ xmalloc( p_var->choices.i_count * sizeof(vlc_value_t) );
+ 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_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_val2->p_list = xmalloc( sizeof(vlc_list_t) );
+ p_val2->p_list->p_values =
+ xmalloc( p_var->choices.i_count * sizeof(vlc_value_t) );
+ p_val2->p_list->i_type = VLC_VAR_STRING;
+ p_val2->p_list->i_count = p_var->choices.i_count;
}
- 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;
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;
p_val->psz_string = p_var->psz_text ? strdup( p_var->psz_text )
: NULL;
break;
- case VLC_VAR_SETISCOMMAND:
- p_var->i_type |= VLC_VAR_ISCOMMAND;
- break;
-
default:
break;
}
p_var = Lookup( p_this, psz_name );
if( p_var != NULL )
+ {
i_type = p_var->i_type;
-
+ if( p_var->choices.i_count > 0 )
+ i_type |= VLC_VAR_HASCHOICE;
+ }
vlc_mutex_unlock( &p_priv->var_lock );
return i_type;
return var_GetChecked( p_this, psz_name, 0, p_val );
}
-#undef var_AddCallback
-/**
- * Register a callback in a variable
- *
- * We store a function pointer that will be called upon variable
- * modification.
- *
- * \param p_this The object that holds the variable
- * \param psz_name The name of the variable
- * \param pf_callback The function pointer
- * \param p_data A generic pointer that will be passed as the last
- * argument to the callback function.
- *
- * \warning The callback function is run in the thread that calls var_Set on
- * the variable. Use proper locking. This thread may not have much
- * time to spare, so keep callback functions short.
- */
-int var_AddCallback( vlc_object_t *p_this, const char *psz_name,
- vlc_callback_t pf_callback, void *p_data )
+static int AddCallback( vlc_object_t *p_this, const char *psz_name,
+ callback_entry_t entry, vlc_callback_type_t i_type )
{
variable_t *p_var;
- callback_entry_t entry;
assert( p_this );
vlc_object_internals_t *p_priv = vlc_internals( p_this );
- entry.pf_callback = pf_callback;
- entry.p_data = p_data;
-
vlc_mutex_lock( &p_priv->var_lock );
p_var = Lookup( p_this, psz_name );
{
vlc_mutex_unlock( &p_priv->var_lock );
msg_Err( p_this, "cannot add callback %p to nonexistent "
- "variable '%s'", pf_callback, psz_name );
+ "variable '%s'", entry.u.p_callback, psz_name );
return VLC_ENOVAR;
}
WaitUnused( p_this, p_var );
- INSERT_ELEM( p_var->p_entries,
- p_var->i_entries,
- p_var->i_entries,
- entry );
+
+ callback_table_t *p_table;
+ if (i_type == vlc_value_callback)
+ p_table = &p_var->value_callbacks;
+ else
+ p_table = &p_var->list_callbacks;
+ INSERT_ELEM( p_table->p_entries,
+ p_table->i_entries,
+ p_table->i_entries,
+ entry);
vlc_mutex_unlock( &p_priv->var_lock );
return VLC_SUCCESS;
}
-#undef var_DelCallback
+#undef var_AddCallback
/**
- * Remove a callback from a variable
+ * Register a callback in a variable
*
- * pf_callback and p_data have to be given again, because different objects
- * might have registered the same callback function.
+ * We store a function pointer that will be called upon variable
+ * modification.
+ *
+ * \param p_this The object that holds the variable
+ * \param psz_name The name of the variable
+ * \param pf_callback The function pointer
+ * \param p_data A generic pointer that will be passed as the last
+ * argument to the callback function.
+ *
+ * \warning The callback function is run in the thread that calls var_Set on
+ * the variable. Use proper locking. This thread may not have much
+ * time to spare, so keep callback functions short.
*/
-int var_DelCallback( vlc_object_t *p_this, const char *psz_name,
+int var_AddCallback( vlc_object_t *p_this, const char *psz_name,
vlc_callback_t pf_callback, void *p_data )
+{
+ callback_entry_t entry;
+ entry.u.pf_value_callback = pf_callback;
+ entry.p_data = p_data;
+
+ return AddCallback(p_this, psz_name, entry, vlc_value_callback);
+}
+
+static int DelCallback( vlc_object_t *p_this, const char *psz_name,
+ callback_entry_t entry, vlc_callback_type_t i_type )
{
int i_entry;
variable_t *p_var;
WaitUnused( p_this, p_var );
- for( i_entry = p_var->i_entries ; i_entry-- ; )
+ callback_table_t *p_table;
+ if (i_type == vlc_value_callback)
+ p_table = &p_var->value_callbacks;
+ else
+ p_table = &p_var->list_callbacks;
+
+ for( i_entry = p_table->i_entries ; i_entry-- ; )
{
- if( p_var->p_entries[i_entry].pf_callback == pf_callback
- && p_var->p_entries[i_entry].p_data == p_data )
+ if( p_table->p_entries[i_entry].u.p_callback == entry.u.p_callback
+ && p_table->p_entries[i_entry].p_data == entry.p_data )
{
break;
}
#ifndef NDEBUG
- else if( p_var->p_entries[i_entry].pf_callback == pf_callback )
+ else if( p_table->p_entries[i_entry].u.p_callback == entry.u.p_callback )
b_found_similar = true;
#endif
}
return VLC_EGENERIC;
}
- REMOVE_ELEM( p_var->p_entries, p_var->i_entries, i_entry );
+ REMOVE_ELEM( p_table->p_entries, p_table->i_entries, i_entry );
vlc_mutex_unlock( &p_priv->var_lock );
return VLC_SUCCESS;
}
+#undef var_DelCallback
+/**
+ * Remove a callback from a variable
+ *
+ * pf_callback and p_data have to be given again, because different objects
+ * might have registered the same callback function.
+ */
+int var_DelCallback( vlc_object_t *p_this, const char *psz_name,
+ vlc_callback_t pf_callback, void *p_data )
+{
+ callback_entry_t entry;
+ entry.u.pf_value_callback = pf_callback;
+ entry.p_data = p_data;
+
+ return DelCallback(p_this, psz_name, entry, vlc_value_callback);
+}
+
#undef var_TriggerCallback
/**
* Trigger callback on a variable
return i_ret;
}
+#undef var_AddListCallback
+/**
+ * Register a callback for a list variable
+ *
+ * The callback is triggered when an element is added/removed from the
+ * list or when the list is cleared.
+ *
+ * See var_AddCallback().
+ */
+int var_AddListCallback( vlc_object_t *p_this, const char *psz_name,
+ vlc_list_callback_t pf_callback, void *p_data )
+{
+ callback_entry_t entry;
+ entry.u.pf_list_callback = pf_callback;
+ entry.p_data = p_data;
+
+ return AddCallback(p_this, psz_name, entry, vlc_list_callback);
+}
+
+#undef var_DelListCallback
+/**
+ * Remove a callback from a list variable
+ *
+ * See var_DelCallback().
+ */
+int var_DelListCallback( vlc_object_t *p_this, const char *psz_name,
+ vlc_list_callback_t pf_callback, void *p_data )
+{
+ callback_entry_t entry;
+ entry.u.pf_list_callback = pf_callback;
+ entry.p_data = p_data;
+
+ return DelCallback(p_this, psz_name, entry, vlc_list_callback);
+}
+
/** Parse a stringified option
* This function parse a string option and create the associated object
* variable
case VLC_VAR_FLOAT:
if( p_var->i_type & VLC_VAR_HASSTEP && p_var->step.f_float )
{
- float f_round = p_var->step.f_float * (float)(int)( 0.5 +
- p_val->f_float / p_var->step.f_float );
- if( p_val->f_float != f_round )
- {
- p_val->f_float = f_round;
- }
+ float f_round = p_var->step.f_float
+ * roundf( p_val->f_float / p_var->step.f_float );
+ p_val->f_float = f_round;
}
if( p_var->i_type & VLC_VAR_HASMIN
&& p_val->f_float < p_var->min.f_float )
unsigned d = strtol(*next ? &next[1] : "0", NULL, 0);
if (*next == '.') {
- /* Interpret as a float number */
- double r = us_atof(tmp);
- double c = ceil(r);
- if (c >= UINT_MAX)
- goto error;
- unsigned m = c;
- if (m > 0) {
- d = UINT_MAX / m;
- n = r * d;
- } else {
- n = 0;
- d = 0;
- }
+ /* Interpret as a (finite positive) float number */
+ const int ubits = CHAR_BIT * sizeof (unsigned);
+ int exp;
+ double f = frexp(us_atof(tmp), &exp);
+
+ if (!isgreaterequal(f, 0.))
+ goto error; /* negative or not a number */
+
+ if (exp <= 1 - ubits) {
+ n = 0; /* too small */
+ d = 1;
+ } else if (exp <= 0) {
+ n = floor(scalbn(f, ubits - 1 + exp));
+#if (FLT_RADIX != 2)
+# error Floating point configuration not supported.
+#endif
+ d = 1u << (ubits - 1);
+ } else if (exp <= ubits) {
+ n = floor(scalbn(f, ubits));
+ d = 1u << (ubits - exp);
+ } else
+ goto error; /* too big */
+ } else if ( *next == '\0' ) {
+ /* plain integer given */
+ *num = n;
+ *den = 1;
}
if (n > 0 && d > 0)
{
assert( p_this );
- int i_entries = p_var->i_entries;
+ callback_table_t *p_table = &p_var->value_callbacks;
+ int i_entries = p_table->i_entries;
if( i_entries == 0 )
return VLC_SUCCESS;
- callback_entry_t *p_entries = p_var->p_entries;
+ callback_entry_t *p_entries = p_table->p_entries;
vlc_object_internals_t *p_priv = vlc_internals( p_this );
assert( !p_var->b_incallback );
/* The real calls */
for( ; i_entries-- ; )
{
- p_entries[i_entries].pf_callback( p_this, psz_name, oldval, p_var->val,
- p_entries[i_entries].p_data );
+ p_entries[i_entries].u.pf_value_callback( p_this, psz_name, oldval, p_var->val,
+ p_entries[i_entries].p_data );
}
vlc_mutex_lock( &p_priv->var_lock );
return VLC_SUCCESS;
}
-#undef var_Command
-/**********************************************************************
- * Execute a var command on an object identified by its name
- **********************************************************************/
-int var_Command( vlc_object_t *p_this, const char *psz_name,
- const char *psz_cmd, const char *psz_arg, char **psz_msg )
+static int TriggerListCallback( vlc_object_t *p_this, variable_t *p_var,
+ const char *psz_name, int i_action,
+ vlc_value_t *val )
{
- vlc_object_t *p_obj = vlc_object_find_name( p_this->p_libvlc,
- psz_name );
- int i_type, i_ret;
-
- if( !p_obj )
- {
- if( psz_msg )
- *psz_msg = strdup( "Unknown destination object." );
- return VLC_ENOOBJ;
- }
+ assert( p_this );
- i_type = var_Type( p_obj, psz_cmd );
- if( !( i_type&VLC_VAR_ISCOMMAND ) )
- {
- vlc_object_release( p_obj );
- if( psz_msg )
- *psz_msg = strdup( "Variable doesn't exist or isn't a command." );
- return VLC_EGENERIC;
- }
+ callback_table_t *p_table = &p_var->list_callbacks;
+ int i_entries = p_table->i_entries;
+ if( i_entries == 0 )
+ return VLC_SUCCESS;
- i_type &= VLC_VAR_CLASS;
- switch( i_type )
- {
- case VLC_VAR_INTEGER:
- i_ret = var_SetInteger( p_obj, psz_cmd, atoi( psz_arg ) );
- break;
- case VLC_VAR_FLOAT:
- i_ret = var_SetFloat( p_obj, psz_cmd, us_atof( psz_arg ) );
- break;
- case VLC_VAR_STRING:
- i_ret = var_SetString( p_obj, psz_cmd, psz_arg );
- break;
- case VLC_VAR_BOOL:
- i_ret = var_SetBool( p_obj, psz_cmd, atoi( psz_arg ) );
- break;
- default:
- i_ret = VLC_EGENERIC;
- break;
- }
+ callback_entry_t *p_entries = p_table->p_entries;
+ vlc_object_internals_t *p_priv = vlc_internals( p_this );
- vlc_object_release( p_obj );
+ assert( !p_var->b_incallback );
+ p_var->b_incallback = true;
+ vlc_mutex_unlock( &p_priv->var_lock );
- if( psz_msg )
+ for( ; i_entries-- ; )
{
- if( asprintf( psz_msg, "%s on object %s returned %i (%s)",
- psz_cmd, psz_name, i_ret, vlc_error( i_ret ) ) == -1)
- *psz_msg = NULL;
+ p_entries[i_entries].u.pf_list_callback( p_this, psz_name, i_action, val,
+ p_entries[i_entries].p_data );
}
- return i_ret;
-}
+ vlc_mutex_lock( &p_priv->var_lock );
+ p_var->b_incallback = false;
+ vlc_cond_broadcast( &p_priv->var_wait );
+ return VLC_SUCCESS;
+}
/**
* Free a list and the associated strings
*/
void var_FreeList( vlc_value_t *p_val, vlc_value_t *p_val2 )
{
- FreeList( p_val );
- if( p_val2 && p_val2->p_list )
+ switch( p_val->p_list->i_type & VLC_VAR_CLASS )
{
+ case VLC_VAR_STRING:
+ for( int i = 0; i < p_val->p_list->i_count; i++ )
+ free( p_val->p_list->p_values[i].psz_string );
+ break;
+ }
+
+ free( p_val->p_list->p_values );
+ free( p_val->p_list );
+
+ if( p_val2 != NULL )
+ {
+ assert( p_val2->p_list != NULL );
+ assert( p_val2->p_list->i_type == VLC_VAR_STRING );
+
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->p_values );
free( p_val2->p_list );
}
}
projects / vlc / blobdiff