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

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 );
......
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