Skip to content

V
vlc-2-2
Commit 42928230 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

variables: use vlc_internals()

parent 23afa490
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
src/misc/variables.c
View file @ 42928230
...@@ -160,7 +160,7 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type ) ...@@ -160,7 +160,7 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type )
int i_new; int i_new;
variable_t *p_var; variable_t *p_var;
static vlc_list_t dummy_null_list = {0, NULL, NULL}; static vlc_list_t dummy_null_list = {0, NULL, NULL};
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock ); vlc_mutex_lock( &p_priv->var_lock );
...@@ -323,7 +323,7 @@ int __var_Destroy( vlc_object_t *p_this, const char *psz_name ) ...@@ -323,7 +323,7 @@ int __var_Destroy( vlc_object_t *p_this, const char *psz_name )
{ {
int i_var, i; int i_var, i;
variable_t *p_var; variable_t *p_var;
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock ); vlc_mutex_lock( &p_priv->var_lock );
...@@ -399,7 +399,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name, ...@@ -399,7 +399,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name,
int i_var, i; int i_var, i;
variable_t *p_var; variable_t *p_var;
vlc_value_t oldval; vlc_value_t oldval;
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock ); vlc_mutex_lock( &p_priv->var_lock );
...@@ -720,7 +720,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name, ...@@ -720,7 +720,7 @@ int __var_Change( vlc_object_t *p_this, const char *psz_name,
int __var_Type( vlc_object_t *p_this, const char *psz_name ) int __var_Type( vlc_object_t *p_this, const char *psz_name )
{ {
int i_var, i_type; int i_var, i_type;
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock ); vlc_mutex_lock( &p_priv->var_lock );
...@@ -751,7 +751,7 @@ int __var_Set( vlc_object_t *p_this, const char *psz_name, vlc_value_t val ) ...@@ -751,7 +751,7 @@ int __var_Set( vlc_object_t *p_this, const char *psz_name, vlc_value_t val )
int i_var; int i_var;
variable_t *p_var; variable_t *p_var;
vlc_value_t oldval; vlc_value_t oldval;
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock ); vlc_mutex_lock( &p_priv->var_lock );
...@@ -828,7 +828,7 @@ int __var_Get( vlc_object_t *p_this, const char *psz_name, vlc_value_t *p_val ) ...@@ -828,7 +828,7 @@ int __var_Get( vlc_object_t *p_this, const char *psz_name, vlc_value_t *p_val )
{ {
int i_var; int i_var;
variable_t *p_var; variable_t *p_var;
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock ); vlc_mutex_lock( &p_priv->var_lock );
...@@ -894,7 +894,7 @@ int __var_AddCallback( vlc_object_t *p_this, const char *psz_name, ...@@ -894,7 +894,7 @@ int __var_AddCallback( vlc_object_t *p_this, const char *psz_name,
int i_var; int i_var;
variable_t *p_var; variable_t *p_var;
callback_entry_t entry; callback_entry_t entry;
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
entry.pf_callback = pf_callback; entry.pf_callback = pf_callback;
entry.p_data = p_data; entry.p_data = p_data;
...@@ -931,7 +931,7 @@ int __var_DelCallback( vlc_object_t *p_this, const char *psz_name, ...@@ -931,7 +931,7 @@ int __var_DelCallback( vlc_object_t *p_this, const char *psz_name,
{ {
int i_entry, i_var; int i_entry, i_var;
variable_t *p_var; variable_t *p_var;
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock ); vlc_mutex_lock( &p_priv->var_lock );
...@@ -977,7 +977,7 @@ int __var_TriggerCallback( vlc_object_t *p_this, const char *psz_name ) ...@@ -977,7 +977,7 @@ int __var_TriggerCallback( vlc_object_t *p_this, const char *psz_name )
int i_var; int i_var;
variable_t *p_var; variable_t *p_var;
vlc_value_t oldval; vlc_value_t oldval;
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
vlc_mutex_lock( &p_priv->var_lock ); vlc_mutex_lock( &p_priv->var_lock );
...@@ -1182,7 +1182,7 @@ cleanup: ...@@ -1182,7 +1182,7 @@ cleanup:
static int GetUnused( vlc_object_t *p_this, const char *psz_name ) static int GetUnused( vlc_object_t *p_this, const char *psz_name )
{ {
int i_var, i_tries = 0; int i_var, i_tries = 0;
vlc_object_internals_t *p_priv = p_this->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this );
while( true ) while( true )
{ {
...@@ -1523,7 +1523,7 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name, ...@@ -1523,7 +1523,7 @@ static int InheritValue( vlc_object_t *p_this, const char *psz_name,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
vlc_object_internals_t *p_priv = p_this->p_parent->p_internals; vlc_object_internals_t *p_priv = vlc_internals( p_this->p_parent );
/* Look for the variable */ /* Look for the variable */
vlc_mutex_lock( &p_priv->var_lock ); vlc_mutex_lock( &p_priv->var_lock );
......
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