Commit 4c2ec049 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove unused vlc_object_lock and vlc_object_unlock

parent a22e0f27
......@@ -111,14 +111,6 @@ VLC_EXPORT( void, vlc_list_release, ( vlc_list_t * ) );
__vlc_list_children( VLC_OBJECT(a) )
/* Objects and threading */
VLC_EXPORT( void, __vlc_object_lock, ( vlc_object_t * ) );
#define vlc_object_lock( obj ) \
__vlc_object_lock( VLC_OBJECT( obj ) )
VLC_EXPORT( void, __vlc_object_unlock, ( vlc_object_t * ) );
#define vlc_object_unlock( obj ) \
__vlc_object_unlock( VLC_OBJECT( obj ) )
VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) );
#define vlc_object_kill(a) \
__vlc_object_kill( VLC_OBJECT(a) )
......
......@@ -166,7 +166,6 @@ typedef struct vlc_object_internals_t
bool b_thread;
/* Objects thread synchronization */
vlc_mutex_t lock;
int pipes[2];
/* Objects management */
......
......@@ -467,10 +467,8 @@ __vlc_object_find
vlc_object_find_name
__vlc_object_hold
__vlc_object_kill
__vlc_object_lock
__vlc_object_release
__vlc_object_set_destructor
__vlc_object_unlock
vlc_plugin_set
vlc_poll
vlc_rand_bytes
......
......@@ -163,7 +163,6 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
p_new->p_private = NULL;
/* Initialize mutexes and condvars */
vlc_mutex_init( &p_priv->lock );
vlc_mutex_init( &p_priv->var_lock );
vlc_cond_init( &p_priv->var_wait );
p_priv->pipes[0] = p_priv->pipes[1] = -1;
......@@ -292,7 +291,6 @@ static void vlc_object_destroy( vlc_object_t *p_this )
FREENULL( p_this->psz_object_name );
vlc_spin_destroy( &p_priv->ref_spin );
vlc_mutex_destroy( &p_priv->lock );
if( p_priv->pipes[1] != -1 && p_priv->pipes[1] != p_priv->pipes[0] )
close( p_priv->pipes[1] );
if( p_priv->pipes[0] != -1 )
......@@ -304,19 +302,6 @@ static void vlc_object_destroy( vlc_object_t *p_this )
}
/** Inter-object signaling */
void __vlc_object_lock( vlc_object_t *obj )
{
vlc_mutex_lock( &(vlc_internals(obj)->lock) );
}
void __vlc_object_unlock( vlc_object_t *obj )
{
vlc_assert_locked( &(vlc_internals(obj)->lock) );
vlc_mutex_unlock( &(vlc_internals(obj)->lock) );
}
#ifdef WIN32
# include <winsock2.h>
# include <ws2tcpip.h>
......
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