{
int i_ret;
libvlc_int_t * p_libvlc = NULL;
- vlc_value_t lockval;
char *psz_env = NULL;
/* vlc_threads_init *must* be the first internal call! No other call is
if( i_ret < 0 ) return NULL;
/* Now that the thread system is initialized, we don't have much, but
- * at least we have var_Create */
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ * at least we have variables */
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
i_instances++;
p_libvlc_global->b_ready = VLC_TRUE;
}
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
/* Allocate a libvlc instance object */
p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC );
p_libvlc->p_hotkeys );
FREENULL( p_libvlc->p_hotkeys );
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
i_instances--;
if( i_instances == 0 )
/* System specific cleaning code */
system_End( p_libvlc );
}
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
msg_Flush( p_libvlc );
msg_Destroy( p_libvlc );
void __module_InitBank( vlc_object_t *p_this )
{
module_bank_t *p_bank = NULL;
- vlc_value_t lockval;
libvlc_global_data_t *p_libvlc_global = vlc_global();
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
if( p_libvlc_global->p_module_bank == NULL )
{
else
p_libvlc_global->p_module_bank->i_usage++;
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
}
void __module_EndBank( vlc_object_t *p_this )
{
module_t * p_next = NULL;
- vlc_value_t lockval;
libvlc_global_data_t *p_libvlc_global = vlc_global();
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
if( !p_libvlc_global->p_module_bank )
{
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
return;
}
if( --p_libvlc_global->p_module_bank->i_usage )
{
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
return;
}
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
/* Save the configuration */
config_AutoSaveConfigFile( p_this );
*/
void __module_LoadBuiltins( vlc_object_t * p_this )
{
- vlc_value_t lockval;
libvlc_global_data_t *p_libvlc_global = vlc_global();
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
if( p_libvlc_global->p_module_bank->b_builtins )
{
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
return;
}
p_libvlc_global->p_module_bank->b_builtins = VLC_TRUE;
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
msg_Dbg( p_this, "checking builtin modules" );
ALLOCATE_ALL_BUILTINS();
void __module_LoadPlugins( vlc_object_t * p_this )
{
#ifdef HAVE_DYNAMIC_PLUGINS
- vlc_value_t lockval;
libvlc_global_data_t *p_libvlc_global = vlc_global();
- var_Create( p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_libvlc_global, "libvlc", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "libvlc" );
if( p_libvlc_global->p_module_bank->b_plugins )
{
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
return;
}
p_libvlc_global->p_module_bank->b_plugins = VLC_TRUE;
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
msg_Dbg( p_this, "checking plugin modules" );