Commit 6da90a17 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

vlc_mutex_init: remove unused paramter

parent c9324503
......@@ -53,7 +53,7 @@ VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) );
/*****************************************************************************
* vlc_mutex_init: initialize a mutex
*****************************************************************************/
#define vlc_mutex_init( P_THIS, P_MUTEX ) \
#define vlc_mutex_init( P_MUTEX ) \
__vlc_mutex_init( P_MUTEX )
/*****************************************************************************
......
......@@ -418,7 +418,7 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys,
p_sys->p_capture_graph_builder2 = NULL;
p_sys->p_control = NULL;
vlc_mutex_init( p_this, &p_sys->lock );
vlc_mutex_init( &p_sys->lock );
vlc_cond_init( p_this, &p_sys->wait );
/* Build directshow graph */
......
......@@ -165,7 +165,7 @@ static int Open( vlc_object_t *p_this )
p_sys->p_frame = NULL;
p_sys->p_ev = NULL;
vlc_mutex_init( p_access, &p_sys->lock );
vlc_mutex_init( &p_sys->lock );
p_sys->i_node = DiscoverAVC( p_access, &p_sys->i_port, p_sys->i_guid );
if( p_sys->i_node < 0 )
......@@ -235,7 +235,7 @@ static int Open( vlc_object_t *p_this )
p_sys->p_ev->p_frame = NULL;
p_sys->p_ev->pp_last = &p_sys->p_ev->p_frame;
p_sys->p_ev->p_access = p_access;
vlc_mutex_init( p_access, &p_sys->p_ev->lock );
vlc_mutex_init( &p_sys->p_ev->lock );
vlc_thread_create( p_sys->p_ev, "dv event thread handler", Raw1394EventThread,
VLC_THREAD_PRIORITY_OUTPUT, false );
......
......@@ -90,7 +90,7 @@ int E_(HTTPOpen)( access_t *p_access )
vlc_acl_t *p_acl = NULL;
httpd_file_sys_t *f;
vlc_mutex_init( p_access, &p_sys->httpd_mutex );
vlc_mutex_init( &p_sys->httpd_mutex );
vlc_cond_init( p_access, &p_sys->httpd_cond );
p_sys->b_request_frontend_info = p_sys->b_request_mmi_info = false;
p_sys->i_httpd_timeout = 0;
......
......@@ -1223,7 +1223,7 @@ static int EventThread( vlc_object_t *p_this )
demux_sys_t *p_sys = p_ev->p_demux->p_sys;
vlc_object_t *p_vout = NULL;
vlc_mutex_init( p_ev, &p_ev->lock );
vlc_mutex_init( &p_ev->lock );
p_ev->b_moved = false;
p_ev->b_clicked = false;
p_ev->i_key_action = 0;
......
......@@ -168,7 +168,7 @@ static int Open( vlc_object_t *p_this )
}
vlc_cond_init( p_sys->p_thread, &p_sys->p_thread->wait );
vlc_mutex_init( p_sys->p_thread, &p_sys->p_thread->lock );
vlc_mutex_init( &p_sys->p_thread->lock );
p_sys->p_thread->result_connect = 1;
p_sys->p_thread->result_play = 1;
......
......@@ -319,7 +319,7 @@ static int Open( vlc_object_t *p_this )
p_sys->b_playing = false;
p_sys->start_date = 0;
vlc_cond_init( p_aout, &p_sys->wait );
vlc_mutex_init( p_aout, &p_sys->lock );
vlc_mutex_init( &p_sys->lock );
/* Get device name */
if( (psz_device = config_GetPsz( p_aout, "alsadev" )) == NULL )
......
......@@ -1195,7 +1195,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
/* Condition because SetProperty is asynchronious */
vlc_cond_init( p_aout, &w.cond );
vlc_mutex_init( p_aout, &w.lock );
vlc_mutex_init( &w.lock );
vlc_mutex_lock( &w.lock );
/* Install the callback */
......
......@@ -217,10 +217,10 @@ static int Open( vlc_object_t * p_this )
pa_thread = vlc_object_create( p_aout, sizeof(pa_thread_t) );
pa_thread->p_aout = p_aout;
pa_thread->b_error = false;
vlc_mutex_init( p_aout, &pa_thread->lock_wait );
vlc_mutex_init( &pa_thread->lock_wait );
vlc_cond_init( p_aout, &pa_thread->wait );
pa_thread->b_wait = false;
vlc_mutex_init( p_aout, &pa_thread->lock_signal );
vlc_mutex_init( &pa_thread->lock_signal );
vlc_cond_init( p_aout, &pa_thread->signal );
pa_thread->b_signal = false;
......
......@@ -326,7 +326,7 @@ static int OpenDecoder( vlc_object_t *p_this )
p_dec->pf_decode_video = DecodeBlock;
p_dec->p_sys->p_image = p_image;
vlc_mutex_init( p_dec, &p_dec->p_sys->lock );
vlc_mutex_init( &p_dec->p_sys->lock );
return VLC_SUCCESS;
}
......
......@@ -790,7 +790,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
pp_contexts[i] = vlc_object_create( p_enc,
sizeof(struct thread_context_t) );
pp_contexts[i]->p_context = p_sys->p_context;
vlc_mutex_init( p_enc, &pp_contexts[i]->lock );
vlc_mutex_init( &pp_contexts[i]->lock );
vlc_cond_init( p_enc, &pp_contexts[i]->cond );
pp_contexts[i]->b_work = 0;
pp_contexts[i]->b_done = 0;
......
......@@ -319,7 +319,7 @@ static int Activate( vlc_object_t *p_this )
p_intf->p_sys->pi_socket_listen = pi_socket;
p_intf->p_sys->i_socket = -1;
p_intf->p_sys->psz_unix_path = psz_unix_path;
vlc_mutex_init( p_intf, &p_intf->p_sys->status_lock );
vlc_mutex_init( &p_intf->p_sys->status_lock );
p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
/* Non-buffered stdout */
......
......@@ -1326,7 +1326,7 @@ public:
,b_pci_packet_set(false)
,p_ev(NULL)
{
vlc_mutex_init( &demuxer, &lock_demuxer );
vlc_mutex_init( &lock_demuxer );
}
virtual ~demux_sys_t()
......@@ -2719,7 +2719,7 @@ void demux_sys_t::StartUiThread()
p_ev = (event_thread_t *) vlc_object_create( &demuxer, sizeof( event_thread_t ) );
p_ev->p_demux = &demuxer;
p_ev->b_die = false;
vlc_mutex_init( p_ev, &p_ev->lock );
vlc_mutex_init( &p_ev->lock );
vlc_thread_create( p_ev, "mkv event thread handler", EventThread,
VLC_THREAD_PRIORITY_LOW, false );
}
......
......@@ -59,7 +59,7 @@ static int DoControl( intf_thread_t *, void *, int, va_list );
VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
{
/* Init */
vlc_mutex_init( p_intf, &lock );
vlc_mutex_init( &lock );
p_vout = NULL;
hide(); setMinimumSize( 16, 16 );
videoSize.rwidth() = -1;
......
......@@ -31,7 +31,7 @@ AsyncQueue::AsyncQueue( intf_thread_t *pIntf ): SkinObject( pIntf ),
m_cmdFlush( this )
{
// Initialize the mutex
vlc_mutex_init( pIntf, &m_lock );
vlc_mutex_init( &m_lock );
// Create a timer
OSFactory *pOsFactory = OSFactory::instance( pIntf );
......
......@@ -96,7 +96,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, HWND _p_parent )
p_parent = _p_parent;
p_child_window = NULL;
vlc_mutex_init( p_intf, &lock );
vlc_mutex_init( &lock );
p_vout = NULL;
......
......@@ -97,7 +97,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, wxWindow *_p_parent ):
p_parent = _p_parent;
p_child_window = 0;
vlc_mutex_init( p_intf, &lock );
vlc_mutex_init( &lock );
b_auto_size = p_intf->p_sys->b_video_autosize;
......
......@@ -180,7 +180,7 @@ static int Open( vlc_object_t *p_this )
p_intf->p_sys = p_sys;
vlc_mutex_init( p_this, &p_sys->lock );
vlc_mutex_init( &p_sys->lock );
p_playlist = pl_Yield( p_intf );
PL_LOCK;
......
......@@ -363,7 +363,7 @@ static int Create( vlc_object_t *p_this )
}
#ifdef HAVE_FONTCONFIG
vlc_mutex_init( p_filter, &p_sys->fontconfig_lock );
vlc_mutex_init( &p_sys->fontconfig_lock );
p_sys->b_fontconfig_ok = false;
p_sys->p_fontconfig = NULL;
......
......@@ -119,7 +119,7 @@ static int gcry_vlc_mutex_init( void **p_sys )
if( p_lock == NULL)
return ENOMEM;
i_val = vlc_mutex_init( (vlc_object_t *)NULL, p_lock );
i_val = vlc_mutex_init( p_lock );
if( i_val )
free( p_lock );
else
......@@ -1123,7 +1123,7 @@ static int OpenServer (vlc_object_t *obj)
/* No certificate validation by default */
p_sys->pf_handshake = gnutls_ContinueHandshake;
vlc_mutex_init( p_server, &p_sys->cache_lock );
vlc_mutex_init( &p_sys->cache_lock );
/* Sets server's credentials */
val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred );
......
......@@ -97,7 +97,7 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC;
}
vlc_mutex_init( p_this, &p_sys->lock );
vlc_mutex_init( &p_sys->lock );
p_intf->p_sys = p_sys;
......
......@@ -287,7 +287,7 @@ static int Open( vlc_object_t *p_this )
vlc_UrlClean( &url );
vlc_mutex_init( p_vod, &p_sys->lock_media );
vlc_mutex_init( &p_sys->lock_media );
TAB_INIT( p_sys->i_media, p_sys->media );
p_sys->i_media_id = 0;
......@@ -421,7 +421,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name,
TAB_APPEND( p_sys->i_media, p_sys->media, p_media );
vlc_mutex_unlock( &p_sys->lock_media );
vlc_mutex_init( p_vod, &p_media->lock );
vlc_mutex_init( &p_media->lock );
p_media->psz_session_name = strdup("");
p_media->psz_session_description = strdup("");
p_media->psz_session_url = strdup("");
......
......@@ -86,7 +86,7 @@ public:
Lockable( Cookie* c )
{
vlc_mutex_init( c->serviceDiscovery, &_mutex );
vlc_mutex_init( &_mutex );
}
~Lockable()
......
......@@ -438,8 +438,8 @@ static int Open( vlc_object_t *p_this )
p_stream->p_sys = p_sys;
vlc_mutex_init( p_stream, &p_sys->lock_sdp );
vlc_mutex_init( p_stream, &p_sys->lock_es );
vlc_mutex_init( &p_sys->lock_sdp );
vlc_mutex_init( &p_sys->lock_es );
psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" );
if( psz != NULL )
......@@ -891,7 +891,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu );
vlc_mutex_init( p_stream, &id->lock_sink );
vlc_mutex_init( &id->lock_sink );
id->sinkc = 0;
id->sinkv = NULL;
id->rtsp_id = NULL;
......
......@@ -84,7 +84,7 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url )
rtsp->host = NULL;
rtsp->url = NULL;
rtsp->psz_path = NULL;
vlc_mutex_init( p_stream, &rtsp->lock );
vlc_mutex_init( &rtsp->lock );
rtsp->port = (url->i_port > 0) ? url->i_port : 554;
rtsp->psz_path = strdup( ( url->psz_path != NULL ) ? url->psz_path : "/" );
......
......@@ -1807,7 +1807,7 @@ static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
int i_priority = p_sys->b_high_priority ? VLC_THREAD_PRIORITY_OUTPUT :
VLC_THREAD_PRIORITY_VIDEO;
p_sys->id_video = id;
vlc_mutex_init( p_stream, &p_sys->lock_out );
vlc_mutex_init( &p_sys->lock_out );
vlc_cond_init( p_stream, &p_sys->cond );
memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) );
p_sys->i_first_pic = 0;
......
......@@ -110,7 +110,7 @@ static int Create( vlc_object_t *p_this )
config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
vlc_mutex_init( p_filter, &p_sys->mask_lock );
vlc_mutex_init( &p_sys->mask_lock );
psz_string =
var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" );
var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback,
......
......@@ -17,7 +17,7 @@ CAtmoDynData::CAtmoDynData(vlc_object_t *p_atmo_filter, CAtmoConfig *pAtmoConfig
this->m_pAtmoConnection = NULL;
this->m_pCurrentEffectThread = NULL;
vlc_mutex_init( p_atmo_filter, &m_lock );
vlc_mutex_init( &m_lock );
}
#else
......
......@@ -19,7 +19,7 @@ CAtmoExternalCaptureInput::CAtmoExternalCaptureInput(CAtmoDynData *pAtmoDynData)
{
m_pCurrentFramePixels = NULL;
vlc_cond_init( this->m_pAtmoThread, &m_WakeupCond );
vlc_mutex_init( m_pAtmoThread, &m_WakeupLock );
vlc_mutex_init( &m_WakeupLock );
msg_Dbg( m_pAtmoThread, "CAtmoExternalCaptureInput created.");
}
......
......@@ -21,7 +21,7 @@ CThread::CThread(vlc_object_t *pOwner)
vlc_object_attach( m_pAtmoThread, m_pOwner);
vlc_mutex_init( m_pAtmoThread, &m_TerminateLock );
vlc_mutex_init( &m_TerminateLock );
err = vlc_cond_init( m_pAtmoThread, &m_TerminateCond );
if(err) {
msg_Err( m_pAtmoThread, "vlc_cond_init failed %d",err);
......
......@@ -991,7 +991,7 @@ static void Atmo_SetupParameters(filter_t *p_filter)
p_sys->i_atmo_height = 48;
vlc_mutex_init( p_filter, &p_sys->filter_lock );
vlc_mutex_init( &p_sys->filter_lock );
#if defined(WIN32)
......
......@@ -206,7 +206,7 @@ static int Create( vlc_object_t *p_this )
p_vout->p_sys->b_double_rate = false;
p_vout->p_sys->last_date = 0;
p_vout->p_sys->p_vout = 0;
vlc_mutex_init( p_vout, &p_vout->p_sys->filter_lock );
vlc_mutex_init( &p_vout->p_sys->filter_lock );
#if defined(CAN_COMPILE_C_ALTIVEC)
if( vlc_CPU() & CPU_CAPABILITY_ALTIVEC )
......
......@@ -174,7 +174,7 @@ static int Create( vlc_object_t *p_this )
var_AddCallback( p_filter, CFG_PREFIX "y", EraseCallback, p_sys );
var_AddCallback( p_filter, CFG_PREFIX "mask", EraseCallback, p_sys );
vlc_mutex_init( p_filter, &p_sys->lock );
vlc_mutex_init( &p_sys->lock );
return VLC_SUCCESS;
}
......
......@@ -753,7 +753,7 @@ static int CreateFilter( vlc_object_t *p_this )
var_AddCallback( p_filter, "logo-transparency", LogoCallback, p_sys );
var_AddCallback( p_filter, "logo-repeat", LogoCallback, p_sys );
vlc_mutex_init( p_filter, &p_logo_list->lock );
vlc_mutex_init( &p_logo_list->lock );
vlc_mutex_lock( &p_logo_list->lock );
LoadLogoList( p_this, p_logo_list );
......
......@@ -301,7 +301,7 @@ static int CreateFilter( vlc_object_t *p_this )
p_filter->pf_sub_filter = Filter;
vlc_mutex_init( p_filter, &p_sys->lock );
vlc_mutex_init( &p_sys->lock );
vlc_mutex_lock( &p_sys->lock );
var_Create( p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
......
......@@ -101,7 +101,7 @@ static int Create( vlc_object_t *p_this )
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
#endif
vlc_mutex_init( p_filter, &p_filter->p_sys->lock );
vlc_mutex_init( &p_filter->p_sys->lock );
return VLC_SUCCESS;
}
......
......@@ -243,7 +243,7 @@ static int CreateFilter( vlc_object_t *p_this )
return VLC_ENOMEM;
}
vlc_mutex_init( p_filter, &p_sys->lock );
vlc_mutex_init( &p_sys->lock );
vlc_mutex_lock( &p_sys->lock );
config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
......
......@@ -174,7 +174,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->hwnd = p_vout->p_sys->hvideownd = NULL;
p_vout->p_sys->hparent = p_vout->p_sys->hfswnd = NULL;
p_vout->p_sys->i_changes = 0;
vlc_mutex_init( p_vout, &p_vout->p_sys->lock );
vlc_mutex_init( &p_vout->p_sys->lock );
SetRectEmpty( &p_vout->p_sys->rect_display );
SetRectEmpty( &p_vout->p_sys->rect_parent );
......
......@@ -230,7 +230,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->hparent = p_vout->p_sys->hfswnd = NULL;
p_vout->p_sys->i_changes = 0;
p_vout->p_sys->b_wallpaper = 0;
vlc_mutex_init( p_vout, &p_vout->p_sys->lock );
vlc_mutex_init( &p_vout->p_sys->lock );
SetRectEmpty( &p_vout->p_sys->rect_display );
SetRectEmpty( &p_vout->p_sys->rect_parent );
......
......@@ -110,7 +110,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->hwnd = p_vout->p_sys->hvideownd = NULL;
p_vout->p_sys->hparent = p_vout->p_sys->hfswnd = NULL;
p_vout->p_sys->i_changes = 0;
vlc_mutex_init( p_vout, &p_vout->p_sys->lock );
vlc_mutex_init( &p_vout->p_sys->lock );
SetRectEmpty( &p_vout->p_sys->rect_display );
SetRectEmpty( &p_vout->p_sys->rect_parent );
......
......@@ -222,7 +222,7 @@ static int OpenVideo ( vlc_object_t *p_this )
p_vout->p_sys->hwnd = p_vout->p_sys->hvideownd = NULL;
p_vout->p_sys->hparent = p_vout->p_sys->hfswnd = NULL;
p_vout->p_sys->i_changes = 0;
vlc_mutex_init( p_vout, &p_vout->p_sys->lock );
vlc_mutex_init( &p_vout->p_sys->lock );
SetRectEmpty( &p_vout->p_sys->rect_display );
SetRectEmpty( &p_vout->p_sys->rect_parent );
......
......@@ -211,7 +211,7 @@ int E_(Activate) ( vlc_object_t *p_this )
return VLC_ENOMEM;
}
vlc_mutex_init( p_vout, &p_vout->p_sys->lock );
vlc_mutex_init( &p_vout->p_sys->lock );
/* Open display, using the "display" config variable or the DISPLAY
* environment variable */
......
......@@ -181,7 +181,7 @@ static int Open( vlc_object_t *p_this )
free( p_sys );
return VLC_EGENERIC;
}
vlc_mutex_init( p_filter, &p_thread->lock );
vlc_mutex_init( &p_thread->lock );
vlc_cond_init( p_filter, &p_thread->wait );
p_thread->i_blocks = 0;
......
......@@ -52,9 +52,9 @@ aout_instance_t * __aout_New( vlc_object_t * p_parent )
}
/* Initialize members. */
vlc_mutex_init( p_parent, &p_aout->input_fifos_lock );
vlc_mutex_init( p_parent, &p_aout->mixer_lock );
vlc_mutex_init( p_parent, &p_aout->output_fifo_lock );
vlc_mutex_init( &p_aout->input_fifos_lock );
vlc_mutex_init( &p_aout->mixer_lock );
vlc_mutex_init( &p_aout->output_fifo_lock );
p_aout->i_nb_inputs = 0;
p_aout->mixer.f_multiplier = 1.0;
p_aout->mixer.b_error = 1;
......
......@@ -85,7 +85,7 @@ static aout_input_t * DecNew( vlc_object_t * p_this, aout_instance_t * p_aout,
}
memset( p_input, 0, sizeof(aout_input_t) );
vlc_mutex_init( p_aout, &p_input->lock );
vlc_mutex_init( &p_input->lock );
p_input->b_changed = 0;
p_input->b_error = 1;
......
......@@ -129,8 +129,8 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
p_new->b_playlist_locked = 0;
p_new->ref_count = 1;
p_new->p_callback_list = NULL;
vlc_mutex_init(p_libvlc_int, &p_new->instance_lock);
vlc_mutex_init(p_libvlc_int, &p_new->event_callback_lock);
vlc_mutex_init(&p_new->instance_lock);
vlc_mutex_init(&p_new->event_callback_lock);
libvlc_event_init(p_new, p_e);
......
......@@ -100,7 +100,7 @@ libvlc_event_manager_new( void * p_obj, libvlc_instance_t * p_libvlc_inst,
p_em->p_libvlc_instance = p_libvlc_inst;
libvlc_retain( p_libvlc_inst );
vlc_array_init( &p_em->listeners_groups );
vlc_mutex_init( p_libvlc_inst->p_libvlc_int, &p_em->object_lock );
vlc_mutex_init( &p_em->object_lock );
vlc_mutex_init_recursive( p_libvlc_inst->p_libvlc_int, &p_em->event_sending_lock );
return p_em;
}
......
......@@ -152,7 +152,7 @@ libvlc_media_list_new( libvlc_instance_t * p_inst,
return NULL;
}
vlc_mutex_init( p_inst->p_libvlc_int, &p_mlist->object_lock );
vlc_mutex_init( &p_mlist->object_lock );
vlc_array_init( &p_mlist->items );
p_mlist->i_refcount = 1;
......
......@@ -259,7 +259,7 @@ libvlc_media_list_player_new( libvlc_instance_t * p_instance,
p_mlp->current_playing_item_path = NULL;
p_mlp->p_mi = NULL;
p_mlp->p_mlist = NULL;
vlc_mutex_init( p_instance->p_libvlc_int, &p_mlp->object_lock );
vlc_mutex_init( &p_mlp->object_lock );
p_mlp->p_event_manager = libvlc_event_manager_new( p_mlp,
p_instance,
p_e );
......
......@@ -328,7 +328,7 @@ libvlc_media_list_view_new( libvlc_media_list_t * p_mlist,
p_mlv->p_this_view_data = this_view_data;
vlc_mutex_init( p_mlv->p_libvlc_instance->p_libvlc_int, &p_mlv->object_lock );
vlc_mutex_init( &p_mlv->object_lock );
p_mlv->i_refcount = 1;
return p_mlv;
......
......@@ -305,8 +305,7 @@ libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance,
* - No lock held in constructor
* - Lock when accessing all variable this lock is held
* - Lock when attempting to destroy the object the lock is also held */
vlc_mutex_init( p_mi->p_libvlc_instance->p_libvlc_int,
&p_mi->object_lock );
vlc_mutex_init( &p_mi->object_lock );
p_mi->p_event_manager = libvlc_event_manager_new( p_mi,
p_libvlc_instance, p_e );
if( libvlc_exception_raised( p_e ) )
......
......@@ -563,7 +563,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
p_owner->b_cc_supported = true;
}
vlc_mutex_init( p_dec, &p_owner->lock_cc );
vlc_mutex_init( &p_owner->lock_cc );
for( i = 0; i < 4; i++ )
{
p_owner->pb_cc_present[i] = false;
......
......@@ -217,7 +217,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
p_input->p->slave = NULL;
/* Init control buffer */
vlc_mutex_init( p_input, &p_input->p->lock_control );
vlc_mutex_init( &p_input->p->lock_control );
p_input->p->i_control = 0;
/* Parse input options */
......@@ -299,7 +299,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
}
memset( &p_input->p->counters, 0, sizeof( p_input->p->counters ) );
vlc_mutex_init( p_input, &p_input->p->counters.counters_lock );
vlc_mutex_init( &p_input->p->counters.counters_lock );
/* Attach only once we are ready */
vlc_object_attach( p_input, p_parent );
......
......@@ -52,7 +52,7 @@ static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i )
p_i->p_stats = NULL;
p_i->p_meta = NULL;
vlc_mutex_init( p_o, &p_i->lock );
vlc_mutex_init( &p_i->lock );
vlc_event_manager_init( &p_i->event_manager, p_i, p_o );
vlc_event_manager_register_event_type( &p_i->event_manager,
vlc_InputItemMetaChanged );
......
......@@ -129,7 +129,7 @@ vlm_t *__vlm_New ( vlc_object_t *p_this )
return NULL;
}
vlc_mutex_init( p_this->p_libvlc, &p_vlm->lock );
vlc_mutex_init( &p_vlm->lock );
p_vlm->i_id = 1;
TAB_INIT( p_vlm->i_media, p_vlm->media );
TAB_INIT( p_vlm->i_schedule, p_vlm->schedule );
......
......@@ -110,7 +110,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
p_intf->b_menu_change = false;
/* Initialize mutexes */
vlc_mutex_init( p_intf, &p_intf->change_lock );
vlc_mutex_init( &p_intf->change_lock );
/* Attach interface to its parent object */
vlc_object_attach( p_intf, p_this );
......
......@@ -204,8 +204,8 @@ libvlc_int_t * libvlc_InternalCreate( void )
msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
/* Initialize mutexes */
vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock );
vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
vlc_mutex_init( &p_libvlc->timer_lock );
vlc_mutex_init( &p_libvlc->config_lock );
#ifdef __APPLE__
vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
#endif
......@@ -720,7 +720,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
vlc_object_release( p_libvlc );
return VLC_ENOMEM;
}
vlc_mutex_init( p_libvlc, &p_libvlc->p_stats->lock );
vlc_mutex_init( &p_libvlc->p_stats->lock );
p_libvlc->p_stats_computer = NULL;
/* Init the array that holds every input item */
......
......@@ -249,7 +249,7 @@ block_fifo_t *block_FifoNew( void )
if( !p_fifo )
return NULL;
vlc_mutex_init( NULL, &p_fifo->lock );
vlc_mutex_init( &p_fifo->lock );
vlc_cond_init( NULL, &p_fifo->wait );
p_fifo->p_first = NULL;
p_fifo->pp_last = &p_fifo->p_first;
......
......@@ -169,7 +169,7 @@ void system_Init( libvlc_int_t *p_this, int *pi_argc, const char *ppsz_argv[] )
CFRelease( all_locales );
}
vlc_mutex_init( p_this, &vlc_global()->iconv_lock );
vlc_mutex_init( &vlc_global()->iconv_lock );
vlc_global()->iconv_macosx = vlc_iconv_open( "UTF-8", "UTF-8-MAC" );
}
......
......@@ -115,7 +115,7 @@ int vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj,
{
p_em->p_obj = p_obj;
p_em->p_parent_object = p_parent_obj;
vlc_mutex_init( p_parent_obj, &p_em->object_lock );
vlc_mutex_init( &p_em->object_lock );
/* We need a recursive lock here, because we need to be able
* to call libvlc_event_detach even if vlc_event_send is in
......
......@@ -85,12 +85,11 @@ static void PrintMsg ( vlc_object_t *, msg_item_t * );
void __msg_Create( vlc_object_t *p_this )
{
int i;
vlc_mutex_init( (vlc_object_t *)NULL,
&(p_this->p_libvlc->msg_bank.lock) );
vlc_mutex_init( &(p_this->p_libvlc->msg_bank.lock) );
for( i = 0; i < 2; i++ )
{
vlc_mutex_init( (vlc_object_t *)NULL, &QUEUE(i).lock );
vlc_mutex_init( &QUEUE(i).lock );
QUEUE(i).b_overflow = false;
QUEUE(i).i_id = i;
QUEUE(i).i_start = 0;
......
......@@ -153,7 +153,7 @@ void *vlc_custom_create( vlc_object_t *p_this, size_t i_size,
p_libvlc_global->i_objects = 0;
p_libvlc_global->pp_objects = NULL;
p_priv->b_attached = true;
vlc_mutex_init( p_new, &structure_lock );
vlc_mutex_init( &structure_lock );
}
else
{
......@@ -188,9 +188,9 @@ 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_new, &p_new->object_lock );
vlc_mutex_init( &p_new->object_lock );
vlc_cond_init( p_new, &p_new->object_wait );
vlc_mutex_init( p_new