vlc_mutex_init: remove unused paramter

diff --git a/include/vlc_threads_funcs.h b/include/vlc_threads_funcs.h
index 9ad4395b962e9bc5ddd77817c31618eaf5f81b16..7cad20c6984b23733d8b5a19c9af6b8575ff3497 100644 (file)
--- a/include/vlc_threads_funcs.h
+++ b/include/vlc_threads_funcs.h
@@ -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 )
 
 /*****************************************************************************

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 53db60c2755b5861288e93cc7e2baf2f188b5622..f4bce976d936e62bede53514460df7f4c293edf3 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -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 */

diff --git a/modules/access/dv.c b/modules/access/dv.c
index 0f83d379168b6f0b74334b9f2c2129be0157419d..1fd7cd52fad9ed6a3a1c937d2d9b8d5f91ec9885 100644 (file)
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -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 );
 

diff --git a/modules/access/dvb/http.c b/modules/access/dvb/http.c
index d65253e45992c5fede8e23424828dfe5fcaa224f..ec79ca2cd28255dedfc862d8d61d8d7a168a34d7 100644 (file)
--- a/modules/access/dvb/http.c
+++ b/modules/access/dvb/http.c
@@ -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;

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 14fadb85cebdf7a3136f2c348b7de109d63163c5..e1ede798ab7e999d7fa0a039ed096e64b613af7b 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -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;

diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c
index 9ae019ed3161eb35753b0f0995791d06437ee414..2af0d031c3e8f3448a44904e2001320a1f8398be 100644 (file)
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -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;

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 4380a170f7d7baf7ae430f72d83376b0c6cd4f89..6c3d8d16f82184de7a2c40da77579c4ba9372830 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -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 )

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index 067f8dd93150a3e371f4178e85692d88d6b0a3e6..06783b8e6ed63506621bbcd80e2bbdc0b72f98d2 100644 (file)
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -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 */

diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c
index 4aab58993965a734b4a527faae2c9f506a013efe..6237e5c2f87fd2ede605e5293777ca4afbd27286 100644 (file)
--- a/modules/audio_output/portaudio.c
+++ b/modules/audio_output/portaudio.c
@@ -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;
 

diff --git a/modules/codec/fake.c b/modules/codec/fake.c
index 83c17a7ad8fc013bcfdb9142219c852b115b01fc..3201526dbd50621ede5720b81bfafee4941627c7 100644 (file)
--- a/modules/codec/fake.c
+++ b/modules/codec/fake.c
@@ -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;
 }

diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c
index eaa5b14023505cb2c89b1d86b8a0505c71851c20..da4d52f71ebdce695c3415964dcbdc482e4039b1 100644 (file)
--- a/modules/codec/ffmpeg/encoder.c
+++ b/modules/codec/ffmpeg/encoder.c
@@ -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;

diff --git a/modules/control/rc.c b/modules/control/rc.c
index ab990baeb11d5a147c4c18a2b263b1d6f9e2b7f4..0773a0584a22a89b5f39148367dc2bd604947db0 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -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 */

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 52a338407adeb371f3a58fa5dc9240c16c556623..af00b8ee0ba64cef124f5354bc823155efd56305 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -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 );
     }

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 7bba2c05c29a8950cef0c67b3a863c50e5d339a7..08a23dfcdb1f30999892d76da575f4fb29bf395d 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -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;

diff --git a/modules/gui/skins2/commands/async_queue.cpp b/modules/gui/skins2/commands/async_queue.cpp
index beee424786c6d4c2179f954020d46b4226d2dcc2..de19dc7b3710fbb4921a1a8bd0cefac36021e98b 100644 (file)
--- a/modules/gui/skins2/commands/async_queue.cpp
+++ b/modules/gui/skins2/commands/async_queue.cpp
@@ -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 );

diff --git a/modules/gui/wince/video.cpp b/modules/gui/wince/video.cpp
index 9c5746e4c43d323486bcded93718b90e1fada813..60bbda1be090baf41b905a6e477b601cd08d7584 100644 (file)
--- a/modules/gui/wince/video.cpp
+++ b/modules/gui/wince/video.cpp
@@ -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;
 

diff --git a/modules/gui/wxwidgets/video.cpp b/modules/gui/wxwidgets/video.cpp
index 18af1dd2266804c7f1d7e8a5755a0379cd954031..7194cc40db2cc7c2e2b8eadc5c76da983b353b1f 100644 (file)
--- a/modules/gui/wxwidgets/video.cpp
+++ b/modules/gui/wxwidgets/video.cpp
@@ -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;
 

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index 2af57e783b875493b8b7c3e4e4337d70bbd480fb..653dd4fc2fba6786a9626b5b3210913630ab0f41 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -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;

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index 94523571c4853b1d1fc9ac40b3de1f02969066ec..7d13d032a19da849261f8174afa1ccc1fc01ddfe 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -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;
 

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index e3c726f8c9fa3e5f8a4ca027a5c4f23a9395eda3..c75ae56935d186bea2b6aa20dbaae1c9b317214b 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -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 );

diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index e4473fbbfd690c5a5c9026a5b9c58ac9c1afb024..8eac27b8f05d707fb10daa660836cab3d9ea32de 100644 (file)
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -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;
 

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index 1b9fad3229fcc3f241a5697d7f7b95df9000cd38..d8d9c808263802c043c52d1d237eec11d2564b45 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -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("");

diff --git a/modules/services_discovery/upnp_intel.cpp b/modules/services_discovery/upnp_intel.cpp
index c1d67a95ccbd162c9e818badacb99d04ad42d735..d745e9b59bdefd9d98d21c88bb331b62e6633d7f 100644 (file)
--- a/modules/services_discovery/upnp_intel.cpp
+++ b/modules/services_discovery/upnp_intel.cpp
@@ -86,7 +86,7 @@ public:
 
     Lockable( Cookie* c )
     {
-    vlc_mutex_init( c->serviceDiscovery, &_mutex );
+    vlc_mutex_init( &_mutex );
     }
 
     ~Lockable()

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 91b29a17d2c4659b10c90c7f111c627b644f3e69..6765e7923f26ae81bbed2798275078f2f5159fdd 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -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;

diff --git a/modules/stream_out/rtsp.c b/modules/stream_out/rtsp.c
index 159bedb92a76bcd59112d7ffed72b8d74ec8e319..241fc3f41ffd5968d309a00d11958bc511f09fd0 100644 (file)
--- a/modules/stream_out/rtsp.c
+++ b/modules/stream_out/rtsp.c
@@ -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 : "/" );

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index ffa3954538a197aef2bf95e227f01e16ae179f7c..d87627ef8822f8632203206793e87ab427fe651f 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -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;

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index 57c255b8863dc66dec2a281fe89e05360ad6cd2b..6127fad1fcb8775f8d71472d7ea84705a4553245 100644 (file)
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -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,

diff --git a/modules/video_filter/atmo/AtmoDynData.cpp b/modules/video_filter/atmo/AtmoDynData.cpp
index 5b39a37744c0f94d21fbd01f9ddcfaa73fc9a474..701e80757d85ab975ed216802e59dddbeecf15bb 100644 (file)
--- a/modules/video_filter/atmo/AtmoDynData.cpp
+++ b/modules/video_filter/atmo/AtmoDynData.cpp
@@ -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

diff --git a/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp b/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp
index 7945473338ca018f8c4ae7c77077043cb8cf6a34..f61943874a53a04136e7e54212f942d5295bd036 100644 (file)
--- a/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp
+++ b/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp
@@ -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.");
 
 }

diff --git a/modules/video_filter/atmo/AtmoThread.cpp b/modules/video_filter/atmo/AtmoThread.cpp
index ad082172f8a2a9c6e273bd444e7d1c0852b5d387..18abfc254727812be2b217cb4aa4176a0fd88dd7 100644 (file)
--- a/modules/video_filter/atmo/AtmoThread.cpp
+++ b/modules/video_filter/atmo/AtmoThread.cpp
@@ -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);

diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index 730b7d8931fd1dee65ed8af8d47af4a45bb010ed..67fcb0462c462e2618f3b190124baf7ddcafa27f 100644 (file)
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -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)

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index b89269aab974a8705fe6d2cc6434e2a752c63c9c..e38a5b3298376b875537b6f9214a9b6e9f4cfd95 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -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 )

diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c
index 482c2f96ae955284abf901386f7310daa9bdbc7a..36fa798483fa73abd1a5c0f0e99183514e4fc144 100644 (file)
--- a/modules/video_filter/erase.c
+++ b/modules/video_filter/erase.c
@@ -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;
 }

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 2345e301de83a04395385377994dced8ee3a72b6..2de5dc89c52d22d4536c72c882ac36f9f5c170aa 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -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 );

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index dd1ac06c074a413dba7e1d39430fa3649b9b32df..0961d378ae975a789f9c0549f2fa9ccf7e3beafc 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -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 );

diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index 73ba4fff3a93ea4f8f7a2d271646fa9e19de4ab0..7e9d8a75efeee89a1973dae58e8b1abd74c22b9e 100644 (file)
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -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;
 }

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 01c5dfa67c7a938308853dbdd908d59ba4e4ee74..9dac79064235840baca5933bbd968b7831df1fde 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -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,

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 93919171c1c4dddfc87272b09933671d9fcb9bc4..371f16bdb94efe76bc165ef995261e294b8ff36a 100644 (file)
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -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 );
 

diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index dd33dea7432e2193de25144454bd885b0f59e44c..cc3a3837def8aec0e0eff893ec7fbb97288185af 100644 (file)
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -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 );
 

diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 9a876043f41f657ae9fcf809f68ad74959bb0176..ad58fae7843e2ae526440ab396ab6875bc95d005 100644 (file)
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -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 );
 

diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/msw/wingdi.c
index 70aaa2124df1d17c1bb167ae5e615ddf2e7a900e..bb513d3132154df454be1defdd096a7fd91f7008 100755 (executable)
--- a/modules/video_output/msw/wingdi.c
+++ b/modules/video_output/msw/wingdi.c
@@ -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 );
 

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index c3bb635341b02ab6415658dbc79945e5ae3fe5d2..b8230349d4942c115bacbd8c4754100845ca3540 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -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 */

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 418d1615651f99867782993695673c1813b5f38a..82a3ba109730632419f9fc79a195503e52100022 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -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;

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 5216dd8f1b58b0946259dc3308c61392baa5a702..742b1b174f6c2ed86547a3be2ea53370b7375ddf 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -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;

diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 2bfb43ce275eb4f4c0f0c582be77288629d32e1e..fa99ea1a7fe79d55cb66acf3cb328c0bcd3951ab 100644 (file)
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -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;

diff --git a/src/control/core.c b/src/control/core.c
index 7e5a77ba43bdb6072501719b1526208e9478ecd0..6f05debe1d9316dde6c32caaf359f6eafb0e05e2 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -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);
 

diff --git a/src/control/event.c b/src/control/event.c
index 31f1050e57459d477a4a245a60bb5e994c9a5355..57cfc6697f54abd52c5f42eb2642144700c0385c 100644 (file)
--- a/src/control/event.c
+++ b/src/control/event.c
@@ -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;
 }

diff --git a/src/control/media_list.c b/src/control/media_list.c
index 3ae87239100a8c185d263b3e703635224ce4b35e..c379db9497d8e4241f8d5ae284585266a05f18ef 100644 (file)
--- a/src/control/media_list.c
+++ b/src/control/media_list.c
@@ -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;

diff --git a/src/control/media_list_player.c b/src/control/media_list_player.c
index 1bb9d724b8eb041a9e7351fc1d897def8d542fcb..10552673d42a2582f4577a72feb0f744ded377db 100644 (file)
--- a/src/control/media_list_player.c
+++ b/src/control/media_list_player.c
@@ -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 );

diff --git a/src/control/media_list_view.c b/src/control/media_list_view.c
index f288c4f414334b96d1c00134eb79a20b01f2f7e2..5ed71d0f9d77e395fdc6ffade8eb2204261209db 100644 (file)
--- a/src/control/media_list_view.c
+++ b/src/control/media_list_view.c
@@ -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;

diff --git a/src/control/media_player.c b/src/control/media_player.c
index d859b390833e3847002f5316678176e4777bdb82..a38df319e7b810a2af647fc7bbb2c2411452cee4 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -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 ) )

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 24d0e61394d3fd7456e82a1a1bc764034fbf4fcc..78908b577c8b06dd31f5e26100621ce855c6b670 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -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;

diff --git a/src/input/input.c b/src/input/input.c
index 687ec79fef3df1b0b67be3bdb1badfb843e288df..86533f49fd8a7dbdb33d7e53532a0efeda862da0 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -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 );

diff --git a/src/input/item.c b/src/input/item.c
index cfca9467f4526222607154f050bc286a094992c6..4aed77ba6d53fb34b848b0619e5c5a80f4bb6f01 100644 (file)
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -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 );

diff --git a/src/input/vlm.c b/src/input/vlm.c
index 28162106f42142a5841e074ac89fd613ac165a4c..7a35e1f1016f3d8edfb2fdba6e875a89239294c5 100644 (file)
--- a/src/input/vlm.c
+++ b/src/input/vlm.c
@@ -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 );

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 21f0a25bbe6a7849996b6889e00d7cc5b605717f..3cdd819b21052697dff9f53750fd2e6c470d3ebf 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -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 );

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 235b11acf755d3ac7c69675481372713d4de3903..46c8d44f7d68c6b46bf7e8e2b88627885f17bc58 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -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 */

diff --git a/src/misc/block.c b/src/misc/block.c
index a6e5dff3a539829f72b650979633cdccc5d143de..eeee4ed29698facae101267e526c6afbd3d55d07 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -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;

diff --git a/src/misc/darwin_specific.c b/src/misc/darwin_specific.c
index f962c1def3f02f66900d0b2e635577173d694580..7c6d129d4fd05e941ba25fc42a37507dff5f85ce 100644 (file)
--- a/src/misc/darwin_specific.c
+++ b/src/misc/darwin_specific.c
@@ -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" );
 }
 

diff --git a/src/misc/events.c b/src/misc/events.c
index e4e5434f9d63ee2124c11e26aa9134956ba5658a..251f0370aea40ef343667ac7d10b9f6c89d88b49 100644 (file)
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -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

diff --git a/src/misc/messages.c b/src/misc/messages.c
index ed17b87c8cf5c9dc23d98e8a024b95af71b04085..a6c0b705cbaeb288a14d152da33b0722df7da547 100644 (file)
--- a/src/misc/messages.c
+++ b/src/misc/messages.c
@@ -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;

diff --git a/src/misc/objects.c b/src/misc/objects.c
index adda93139319dfa350950baf3b6941c217c671a7..33c8b32de18794d9857d309b0476be9d7911c63b 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -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, &p_priv->var_lock );
+    vlc_mutex_init( &p_priv->var_lock );
     vlc_spin_init( &p_priv->spin );
     p_priv->pipes[0] = p_priv->pipes[1] = -1;
 

diff --git a/src/misc/stats.c b/src/misc/stats.c
index 191dc82d362eeb36d2b9d4a6c5d42bee9b4a3c12..9a5a8b6030417302c46b2ca434619d79d68c5746 100644 (file)
--- a/src/misc/stats.c
+++ b/src/misc/stats.c
@@ -149,7 +149,7 @@ input_stats_t *stats_NewInputStats( input_thread_t *p_input )
         return NULL;
 
     memset( p_stats, 0, sizeof(*p_stats) );
-    vlc_mutex_init( p_input, &p_stats->lock );
+    vlc_mutex_init( &p_stats->lock );
     stats_ReinitInputStats( p_stats );
 
     return p_stats;

diff --git a/src/misc/update.c b/src/misc/update.c
index b84de8368cc3c5d9cca54f7be0abc2b4cb00a361..8b3a4ad871cc051ead9c050768871613e503f2a5 100644 (file)
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -845,7 +845,7 @@ update_t *__update_New( vlc_object_t *p_this )
     p_update = (update_t *)malloc( sizeof( update_t ) );
     if( !p_update ) return NULL;
 
-    vlc_mutex_init( p_this, &p_update->lock );
+    vlc_mutex_init( &p_update->lock );
 
     p_update->p_libvlc = p_this->p_libvlc;
 

diff --git a/src/misc/variables.c b/src/misc/variables.c
index 052d9039e86d9b2c5e6fc3bf499b045d0ef835af..f4d6edb57e11262361fe0c32372d356bf3a6e0ea 100644 (file)
--- a/src/misc/variables.c
+++ b/src/misc/variables.c
@@ -265,7 +265,7 @@ int __var_Create( vlc_object_t *p_this, const char *psz_name, int i_type )
             p_var->pf_cmp = CmpAddress;
             p_var->pf_free = FreeMutex;
             p_var->val.p_address = malloc( sizeof(vlc_mutex_t) );
-            vlc_mutex_init( p_this, (vlc_mutex_t*)p_var->val.p_address );
+            vlc_mutex_init( (vlc_mutex_t*)p_var->val.p_address );
             break;
         case VLC_VAR_LIST:
             p_var->pf_cmp = CmpAddress;

diff --git a/src/network/httpd.c b/src/network/httpd.c
index d96882b410494e3a2eff8d371a9e68bc86fad1e1..ec18c72ce44d49dd8285c3220ce76b9e4e5af7ae 100644 (file)
--- a/src/network/httpd.c
+++ b/src/network/httpd.c
@@ -866,7 +866,7 @@ httpd_stream_t *httpd_StreamNew( httpd_host_t *host,
         free( stream );
         return NULL;
     }
-    vlc_mutex_init( host, &stream->lock );
+    vlc_mutex_init( &stream->lock );
     if( psz_mime && *psz_mime )
     {
         stream->psz_mime = strdup( psz_mime );
@@ -1087,7 +1087,7 @@ httpd_host_t *httpd_TLSHostNew( vlc_object_t *p_this, const char *psz_hostname,
     vlc_object_unlock( host );
 
     host->httpd = httpd;
-    vlc_mutex_init( httpd, &host->lock );
+    vlc_mutex_init( &host->lock );
     host->i_ref = 1;
 
     host->fds = net_ListenTCP( p_this, psz_host, i_port );
@@ -1238,7 +1238,7 @@ static httpd_url_t *httpd_UrlNewPrivate( httpd_host_t *host, const char *psz_url
     url = malloc( sizeof( httpd_url_t ) );
     url->host = host;
 
-    vlc_mutex_init( host->httpd, &url->lock );
+    vlc_mutex_init( &url->lock );
     url->psz_url = strdup( psz_url );
     url->psz_user = strdup( psz_user ? psz_user : "" );
     url->psz_password = strdup( psz_password ? psz_password : "" );

diff --git a/src/playlist/engine.c b/src/playlist/engine.c
index 18d831e8379af6987db5bc72a6d4609c976dcc57..f39f60355ac6582e58dd205ffeb665b23dda1315 100644 (file)
--- a/src/playlist/engine.c
+++ b/src/playlist/engine.c
@@ -79,7 +79,7 @@ playlist_t * playlist_Create( vlc_object_t *p_parent )
     VariablesInit( p_playlist );
 
     /* Initialise data structures */
-    vlc_mutex_init( p_playlist, &p_playlist->gc_lock );
+    vlc_mutex_init( &p_playlist->gc_lock );
     p_playlist->i_last_playlist_id = 0;
     p_playlist->p_input = NULL;
 

diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
index 7dc5254e43fed3c688593c58ce3d0a93d1315a5c..83fc4998d2c9df393d3f955949b9e71ac7aebbed 100644 (file)
--- a/src/stream_output/sap.c
+++ b/src/stream_output/sap.c
@@ -130,7 +130,7 @@ sap_handler_t *announce_SAPHandlerCreate( announce_handler_t *p_announce )
 
     p_sap->psz_object_name = strdup( "sap announcer" );
 
-    vlc_mutex_init( p_sap, &p_sap->object_lock );
+    vlc_mutex_init( &p_sap->object_lock );
 
     p_sap->pf_add = announce_SAPAnnounceAdd;
     p_sap->pf_del = announce_SAPAnnounceDel;

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index dbfbd7d61ad260cb952ca9ffefbe8e33f2065d13..93267f7958dc68508c89c7c8bc6b2ba247c68b81 100644 (file)
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -92,7 +92,7 @@ sout_instance_t *__sout_NewInstance( vlc_object_t *p_parent, char * psz_dest )
     p_sout->i_out_pace_nocontrol = 0;
     p_sout->p_sys       = NULL;
 
-    vlc_mutex_init( p_sout, &p_sout->lock );
+    vlc_mutex_init( &p_sout->lock );
     if( psz_dest && psz_dest[0] == '#' )
     {
         p_sout->psz_chain = strdup( &psz_dest[1] );

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 67f16216e0862cf3a91cef50e4f500542668ce5e..b9516d29a5e433dd1bb6ee6ee78f62e9e1e53e19 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -314,9 +314,9 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     p_vout->i_par_num = p_vout->i_par_den = 1;
 
     /* Initialize locks */
-    vlc_mutex_init( p_vout, &p_vout->picture_lock );
-    vlc_mutex_init( p_vout, &p_vout->change_lock );
-    vlc_mutex_init( p_vout, &p_vout->vfilter_lock );
+    vlc_mutex_init( &p_vout->picture_lock );
+    vlc_mutex_init( &p_vout->change_lock );
+    vlc_mutex_init( &p_vout->vfilter_lock );
 
     /* Mouse coordinates */
     var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 8f58dad36cb384401d102f9359fa205cc92accc6..b76de98ce166fff379bb32c33ea749374d4824dd 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -94,7 +94,7 @@ spu_t *__spu_Create( vlc_object_t *p_this )
     /* Register the default subpicture channel */
     p_spu->i_channel = 2;
 
-    vlc_mutex_init( p_this, &p_spu->subpicture_lock );
+    vlc_mutex_init( &p_spu->subpicture_lock );
 
     vlc_object_attach( p_spu, p_this );