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 ) ); ...@@ -53,7 +53,7 @@ VLC_EXPORT( void, __vlc_thread_join, ( vlc_object_t *, const char *, int ) );
/***************************************************************************** /*****************************************************************************
* vlc_mutex_init: initialize a mutex * 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 ) __vlc_mutex_init( P_MUTEX )
/***************************************************************************** /*****************************************************************************
......
...@@ -418,7 +418,7 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, ...@@ -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_capture_graph_builder2 = NULL;
p_sys->p_control = 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 ); vlc_cond_init( p_this, &p_sys->wait );
/* Build directshow graph */ /* Build directshow graph */
......
...@@ -165,7 +165,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -165,7 +165,7 @@ static int Open( vlc_object_t *p_this )
p_sys->p_frame = NULL; p_sys->p_frame = NULL;
p_sys->p_ev = 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 ); p_sys->i_node = DiscoverAVC( p_access, &p_sys->i_port, p_sys->i_guid );
if( p_sys->i_node < 0 ) if( p_sys->i_node < 0 )
...@@ -235,7 +235,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -235,7 +235,7 @@ static int Open( vlc_object_t *p_this )
p_sys->p_ev->p_frame = NULL; p_sys->p_ev->p_frame = NULL;
p_sys->p_ev->pp_last = &p_sys->p_ev->p_frame; p_sys->p_ev->pp_last = &p_sys->p_ev->p_frame;
p_sys->p_ev->p_access = p_access; 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_create( p_sys->p_ev, "dv event thread handler", Raw1394EventThread,
VLC_THREAD_PRIORITY_OUTPUT, false ); VLC_THREAD_PRIORITY_OUTPUT, false );
......
...@@ -90,7 +90,7 @@ int E_(HTTPOpen)( access_t *p_access ) ...@@ -90,7 +90,7 @@ int E_(HTTPOpen)( access_t *p_access )
vlc_acl_t *p_acl = NULL; vlc_acl_t *p_acl = NULL;
httpd_file_sys_t *f; 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 ); vlc_cond_init( p_access, &p_sys->httpd_cond );
p_sys->b_request_frontend_info = p_sys->b_request_mmi_info = false; p_sys->b_request_frontend_info = p_sys->b_request_mmi_info = false;
p_sys->i_httpd_timeout = 0; p_sys->i_httpd_timeout = 0;
......
...@@ -1223,7 +1223,7 @@ static int EventThread( vlc_object_t *p_this ) ...@@ -1223,7 +1223,7 @@ static int EventThread( vlc_object_t *p_this )
demux_sys_t *p_sys = p_ev->p_demux->p_sys; demux_sys_t *p_sys = p_ev->p_demux->p_sys;
vlc_object_t *p_vout = NULL; 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_moved = false;
p_ev->b_clicked = false; p_ev->b_clicked = false;
p_ev->i_key_action = 0; p_ev->i_key_action = 0;
......
...@@ -168,7 +168,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -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_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_connect = 1;
p_sys->p_thread->result_play = 1; p_sys->p_thread->result_play = 1;
......
...@@ -319,7 +319,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -319,7 +319,7 @@ static int Open( vlc_object_t *p_this )
p_sys->b_playing = false; p_sys->b_playing = false;
p_sys->start_date = 0; p_sys->start_date = 0;
vlc_cond_init( p_aout, &p_sys->wait ); 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 */ /* Get device name */
if( (psz_device = config_GetPsz( p_aout, "alsadev" )) == NULL ) if( (psz_device = config_GetPsz( p_aout, "alsadev" )) == NULL )
......
...@@ -1195,7 +1195,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str ...@@ -1195,7 +1195,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
/* Condition because SetProperty is asynchronious */ /* Condition because SetProperty is asynchronious */
vlc_cond_init( p_aout, &w.cond ); vlc_cond_init( p_aout, &w.cond );
vlc_mutex_init( p_aout, &w.lock ); vlc_mutex_init( &w.lock );
vlc_mutex_lock( &w.lock ); vlc_mutex_lock( &w.lock );
/* Install the callback */ /* Install the callback */
......
...@@ -217,10 +217,10 @@ static int Open( vlc_object_t * p_this ) ...@@ -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 = vlc_object_create( p_aout, sizeof(pa_thread_t) );
pa_thread->p_aout = p_aout; pa_thread->p_aout = p_aout;
pa_thread->b_error = false; 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 ); vlc_cond_init( p_aout, &pa_thread->wait );
pa_thread->b_wait = false; 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 ); vlc_cond_init( p_aout, &pa_thread->signal );
pa_thread->b_signal = false; pa_thread->b_signal = false;
......
...@@ -326,7 +326,7 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -326,7 +326,7 @@ static int OpenDecoder( vlc_object_t *p_this )
p_dec->pf_decode_video = DecodeBlock; p_dec->pf_decode_video = DecodeBlock;
p_dec->p_sys->p_image = p_image; 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; return VLC_SUCCESS;
} }
......
...@@ -790,7 +790,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) ...@@ -790,7 +790,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
pp_contexts[i] = vlc_object_create( p_enc, pp_contexts[i] = vlc_object_create( p_enc,
sizeof(struct thread_context_t) ); sizeof(struct thread_context_t) );
pp_contexts[i]->p_context = p_sys->p_context; 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 ); vlc_cond_init( p_enc, &pp_contexts[i]->cond );
pp_contexts[i]->b_work = 0; pp_contexts[i]->b_work = 0;
pp_contexts[i]->b_done = 0; pp_contexts[i]->b_done = 0;
......
...@@ -319,7 +319,7 @@ static int Activate( vlc_object_t *p_this ) ...@@ -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->pi_socket_listen = pi_socket;
p_intf->p_sys->i_socket = -1; p_intf->p_sys->i_socket = -1;
p_intf->p_sys->psz_unix_path = psz_unix_path; 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; p_intf->p_sys->i_last_state = PLAYLIST_STOPPED;
/* Non-buffered stdout */ /* Non-buffered stdout */
......
...@@ -1326,7 +1326,7 @@ public: ...@@ -1326,7 +1326,7 @@ public:
,b_pci_packet_set(false) ,b_pci_packet_set(false)
,p_ev(NULL) ,p_ev(NULL)
{ {
vlc_mutex_init( &demuxer, &lock_demuxer ); vlc_mutex_init( &lock_demuxer );
} }
virtual ~demux_sys_t() virtual ~demux_sys_t()
...@@ -2719,7 +2719,7 @@ void demux_sys_t::StartUiThread() ...@@ -2719,7 +2719,7 @@ void demux_sys_t::StartUiThread()
p_ev = (event_thread_t *) vlc_object_create( &demuxer, sizeof( event_thread_t ) ); p_ev = (event_thread_t *) vlc_object_create( &demuxer, sizeof( event_thread_t ) );
p_ev->p_demux = &demuxer; p_ev->p_demux = &demuxer;
p_ev->b_die = false; 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_create( p_ev, "mkv event thread handler", EventThread,
VLC_THREAD_PRIORITY_LOW, false ); VLC_THREAD_PRIORITY_LOW, false );
} }
......
...@@ -59,7 +59,7 @@ static int DoControl( intf_thread_t *, void *, int, va_list ); ...@@ -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 ) VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
{ {
/* Init */ /* Init */
vlc_mutex_init( p_intf, &lock ); vlc_mutex_init( &lock );
p_vout = NULL; p_vout = NULL;
hide(); setMinimumSize( 16, 16 ); hide(); setMinimumSize( 16, 16 );
videoSize.rwidth() = -1; videoSize.rwidth() = -1;
......
...@@ -31,7 +31,7 @@ AsyncQueue::AsyncQueue( intf_thread_t *pIntf ): SkinObject( pIntf ), ...@@ -31,7 +31,7 @@ AsyncQueue::AsyncQueue( intf_thread_t *pIntf ): SkinObject( pIntf ),
m_cmdFlush( this ) m_cmdFlush( this )
{ {
// Initialize the mutex // Initialize the mutex
vlc_mutex_init( pIntf, &m_lock ); vlc_mutex_init( &m_lock );
// Create a timer // Create a timer
OSFactory *pOsFactory = OSFactory::instance( pIntf ); OSFactory *pOsFactory = OSFactory::instance( pIntf );
......
...@@ -96,7 +96,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, HWND _p_parent ) ...@@ -96,7 +96,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, HWND _p_parent )
p_parent = _p_parent; p_parent = _p_parent;
p_child_window = NULL; p_child_window = NULL;
vlc_mutex_init( p_intf, &lock ); vlc_mutex_init( &lock );
p_vout = NULL; p_vout = NULL;
......
...@@ -97,7 +97,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, wxWindow *_p_parent ): ...@@ -97,7 +97,7 @@ VideoWindow::VideoWindow( intf_thread_t *_p_intf, wxWindow *_p_parent ):
p_parent = _p_parent; p_parent = _p_parent;
p_child_window = 0; p_child_window = 0;
vlc_mutex_init( p_intf, &lock ); vlc_mutex_init( &lock );
b_auto_size = p_intf->p_sys->b_video_autosize; b_auto_size = p_intf->p_sys->b_video_autosize;
......
...@@ -180,7 +180,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -180,7 +180,7 @@ static int Open( vlc_object_t *p_this )
p_intf->p_sys = p_sys; 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 ); p_playlist = pl_Yield( p_intf );
PL_LOCK; PL_LOCK;
......
...@@ -363,7 +363,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -363,7 +363,7 @@ static int Create( vlc_object_t *p_this )
} }
#ifdef HAVE_FONTCONFIG #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->b_fontconfig_ok = false;
p_sys->p_fontconfig = NULL; p_sys->p_fontconfig = NULL;
......
...@@ -119,7 +119,7 @@ static int gcry_vlc_mutex_init( void **p_sys ) ...@@ -119,7 +119,7 @@ static int gcry_vlc_mutex_init( void **p_sys )
if( p_lock == NULL) if( p_lock == NULL)
return ENOMEM; return ENOMEM;
i_val = vlc_mutex_init( (vlc_object_t *)NULL, p_lock ); i_val = vlc_mutex_init( p_lock );
if( i_val ) if( i_val )
free( p_lock ); free( p_lock );
else else
...@@ -1123,7 +1123,7 @@ static int OpenServer (vlc_object_t *obj) ...@@ -1123,7 +1123,7 @@ static int OpenServer (vlc_object_t *obj)
/* No certificate validation by default */ /* No certificate validation by default */
p_sys->pf_handshake = gnutls_ContinueHandshake; 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 */ /* Sets server's credentials */
val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred ); val = gnutls_certificate_allocate_credentials( &p_sys->x509_cred );
......
...@@ -97,7 +97,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -97,7 +97,7 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
vlc_mutex_init( p_this, &p_sys->lock ); vlc_mutex_init( &p_sys->lock );
p_intf->p_sys = p_sys; p_intf->p_sys = p_sys;
......
...@@ -287,7 +287,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -287,7 +287,7 @@ static int Open( vlc_object_t *p_this )
vlc_UrlClean( &url ); 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 ); TAB_INIT( p_sys->i_media, p_sys->media );
p_sys->i_media_id = 0; p_sys->i_media_id = 0;
...@@ -421,7 +421,7 @@ static vod_media_t *MediaNew( vod_t *p_vod, const char *psz_name, ...@@ -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 ); TAB_APPEND( p_sys->i_media, p_sys->media, p_media );
vlc_mutex_unlock( &p_sys->lock_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_name = strdup("");
p_media->psz_session_description = strdup(""); p_media->psz_session_description = strdup("");
p_media->psz_session_url = strdup(""); p_media->psz_session_url = strdup("");
......
...@@ -86,7 +86,7 @@ public: ...@@ -86,7 +86,7 @@ public:
Lockable( Cookie* c ) Lockable( Cookie* c )
{ {
vlc_mutex_init( c->serviceDiscovery, &_mutex ); vlc_mutex_init( &_mutex );
} }
~Lockable() ~Lockable()
......
...@@ -438,8 +438,8 @@ static int Open( vlc_object_t *p_this ) ...@@ -438,8 +438,8 @@ static int Open( vlc_object_t *p_this )
p_stream->p_sys = p_sys; p_stream->p_sys = p_sys;
vlc_mutex_init( p_stream, &p_sys->lock_sdp ); vlc_mutex_init( &p_sys->lock_sdp );
vlc_mutex_init( p_stream, &p_sys->lock_es ); vlc_mutex_init( &p_sys->lock_es );
psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" ); psz = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "mux" );
if( psz != NULL ) if( psz != NULL )
...@@ -891,7 +891,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt ) ...@@ -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 ); 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->sinkc = 0;
id->sinkv = NULL; id->sinkv = NULL;
id->rtsp_id = NULL; id->rtsp_id = NULL;
......
...@@ -84,7 +84,7 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url ) ...@@ -84,7 +84,7 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url )
rtsp->host = NULL; rtsp->host = NULL;
rtsp->url = NULL; rtsp->url = NULL;
rtsp->psz_path = 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->port = (url->i_port > 0) ? url->i_port : 554;
rtsp->psz_path = strdup( ( url->psz_path != NULL ) ? url->psz_path : "/" ); 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 ) ...@@ -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 : int i_priority = p_sys->b_high_priority ? VLC_THREAD_PRIORITY_OUTPUT :
VLC_THREAD_PRIORITY_VIDEO; VLC_THREAD_PRIORITY_VIDEO;
p_sys->id_video = id; 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 ); vlc_cond_init( p_stream, &p_sys->cond );
memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) ); memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) );
p_sys->i_first_pic = 0; p_sys->i_first_pic = 0;
......
...@@ -110,7 +110,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -110,7 +110,7 @@ static int Create( vlc_object_t *p_this )
config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options, config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
p_filter->p_cfg ); p_filter->p_cfg );
vlc_mutex_init( p_filter, &p_sys->mask_lock ); vlc_mutex_init( &p_sys->mask_lock );
psz_string = psz_string =
var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" ); var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" );
var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback, var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback,
......
...@@ -17,7 +17,7 @@ CAtmoDynData::CAtmoDynData(vlc_object_t *p_atmo_filter, CAtmoConfig *pAtmoConfig ...@@ -17,7 +17,7 @@ CAtmoDynData::CAtmoDynData(vlc_object_t *p_atmo_filter, CAtmoConfig *pAtmoConfig
this->m_pAtmoConnection = NULL; this->m_pAtmoConnection = NULL;
this->m_pCurrentEffectThread = NULL; this->m_pCurrentEffectThread = NULL;
vlc_mutex_init( p_atmo_filter, &m_lock ); vlc_mutex_init( &m_lock );
} }
#else #else
......
...@@ -19,7 +19,7 @@ CAtmoExternalCaptureInput::CAtmoExternalCaptureInput(CAtmoDynData *pAtmoDynData) ...@@ -19,7 +19,7 @@ CAtmoExternalCaptureInput::CAtmoExternalCaptureInput(CAtmoDynData *pAtmoDynData)
{ {
m_pCurrentFramePixels = NULL; m_pCurrentFramePixels = NULL;
vlc_cond_init( this->m_pAtmoThread, &m_WakeupCond ); 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."); msg_Dbg( m_pAtmoThread, "CAtmoExternalCaptureInput created.");
} }
......
...@@ -21,7 +21,7 @@ CThread::CThread(vlc_object_t *pOwner) ...@@ -21,7 +21,7 @@ CThread::CThread(vlc_object_t *pOwner)
vlc_object_attach( m_pAtmoThread, m_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 ); err = vlc_cond_init( m_pAtmoThread, &m_TerminateCond );
if(err) { if(err) {
msg_Err( m_pAtmoThread, "vlc_cond_init failed %d",err); msg_Err( m_pAtmoThread, "vlc_cond_init failed %d",err);
......
...@@ -991,7 +991,7 @@ static void Atmo_SetupParameters(filter_t *p_filter) ...@@ -991,7 +991,7 @@ static void Atmo_SetupParameters(filter_t *p_filter)
p_sys->i_atmo_height = 48; 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) #if defined(WIN32)
......
...@@ -206,7 +206,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -206,7 +206,7 @@ static int Create( vlc_object_t *p_this )
p_vout->p_sys->b_double_rate = false; p_vout->p_sys->b_double_rate = false;
p_vout->p_sys->last_date = 0; p_vout->p_sys->last_date = 0;
p_vout->p_sys->p_vout = 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 defined(CAN_COMPILE_C_ALTIVEC)
if( vlc_CPU() & CPU_CAPABILITY_ALTIVEC ) if( vlc_CPU() & CPU_CAPABILITY_ALTIVEC )
......
...@@ -174,7 +174,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -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 "y", EraseCallback, p_sys );
var_AddCallback( p_filter, CFG_PREFIX "mask", 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; return VLC_SUCCESS;
} }
......
...@@ -753,7 +753,7 @@ static int CreateFilter( vlc_object_t *p_this ) ...@@ -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-transparency", LogoCallback, p_sys );
var_AddCallback( p_filter, "logo-repeat", 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 ); vlc_mutex_lock( &p_logo_list->lock );
LoadLogoList( p_this, p_logo_list ); LoadLogoList( p_this, p_logo_list );
......
...@@ -301,7 +301,7 @@ static int CreateFilter( vlc_object_t *p_this ) ...@@ -301,7 +301,7 @@ static int CreateFilter( vlc_object_t *p_this )
p_filter->pf_sub_filter = Filter; 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 ); vlc_mutex_lock( &p_sys->lock );
var_Create( p_libvlc, "mosaic-lock", VLC_VAR_MUTEX ); var_Create( p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
......
...@@ -101,7 +101,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -101,7 +101,7 @@ static int Create( vlc_object_t *p_this )
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options, config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg ); p_filter->p_cfg );
#endif #endif
vlc_mutex_init( p_filter, &p_filter->p_sys->lock ); vlc_mutex_init( &p_filter->p_sys->lock );
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -243,7 +243,7 @@ static int CreateFilter( vlc_object_t *p_this ) ...@@ -243,7 +243,7 @@ static int CreateFilter( vlc_object_t *p_this )
return VLC_ENOMEM; return VLC_ENOMEM;
} }
vlc_mutex_init( p_filter, &p_sys->lock ); vlc_mutex_init( &p_sys->lock );
vlc_mutex_lock( &p_sys->lock ); vlc_mutex_lock( &p_sys->lock );