vlc_cond_init: really remove useless parameter

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index 6539de0fd648eea23d38a73e950519ca0b30761b..771f33232ca235d6ec72b931105da38f996e8488 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -133,7 +133,7 @@ typedef DWORD   vlc_threadvar_t;
 VLC_EXPORT( int,  vlc_mutex_init,    ( vlc_mutex_t * ) );
 VLC_EXPORT( int,  vlc_mutex_init_recursive, ( vlc_mutex_t * ) );
 VLC_EXPORT( void,  __vlc_mutex_destroy, ( const char *, int, vlc_mutex_t * ) );
-VLC_EXPORT( int,  __vlc_cond_init,     ( vlc_cond_t * ) );
+VLC_EXPORT( int,  vlc_cond_init,     ( vlc_cond_t * ) );
 VLC_EXPORT( void,  __vlc_cond_destroy,  ( const char *, int, vlc_cond_t * ) );
 VLC_EXPORT( int, vlc_threadvar_create, (vlc_threadvar_t * , void (*) (void *) ) );
 VLC_EXPORT( void, vlc_threadvar_delete, (vlc_threadvar_t *) );
@@ -338,12 +338,6 @@ static inline void vlc_cleanup_lock (void *lock)
 }
 #define mutex_cleanup_push( lock ) vlc_cleanup_push (vlc_cleanup_lock, lock)
 
-/*****************************************************************************
- * vlc_cond_init: initialize a condition
- *****************************************************************************/
-#define vlc_cond_init( P_THIS, P_COND )                                     \
-    __vlc_cond_init( P_COND )
-
 /*****************************************************************************
  * vlc_cond_signal: start a thread on condition completion
  *****************************************************************************/

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index c6dd19b4e701e9ad47dcd486da2690c69e99b6ad..7d9b59ed4360574310d26f94bed38b32d6bba6d7 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -440,7 +440,7 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys,
     p_sys->p_control = NULL;
 
     vlc_mutex_init( &p_sys->lock );
-    vlc_cond_init( p_this, &p_sys->wait );
+    vlc_cond_init( &p_sys->wait );
 
     /* Build directshow graph */
     CreateDirectShowGraph( p_sys );

diff --git a/modules/access/dvb/http.c b/modules/access/dvb/http.c
index 64c139d4126100d29efb908f1ce985721abe8663..416998863c4bfc8b5d8cdf6b040c421eed47c39c 100644 (file)
--- a/modules/access/dvb/http.c
+++ b/modules/access/dvb/http.c
@@ -95,7 +95,7 @@ int HTTPOpen( access_t *p_access )
     httpd_file_sys_t *f;
 
     vlc_mutex_init( &p_sys->httpd_mutex );
-    vlc_cond_init( p_access, &p_sys->httpd_cond );
+    vlc_cond_init( &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/rtmp/access.c b/modules/access/rtmp/access.c
index bee0c1b25e6768b00dc1feaf517d72af90dc3ece..4f16262410741312d2cbab25e69306fed085dae9 100644 (file)
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -157,7 +157,7 @@ static int Open( vlc_object_t *p_this )
 
     p_sys->p_thread->p_base_object = p_this;
 
-    vlc_cond_init( p_sys->p_thread, &p_sys->p_thread->wait );
+    vlc_cond_init( &p_sys->p_thread->wait );
 
     vlc_mutex_init( &p_sys->p_thread->lock );
 

diff --git a/modules/access_output/rtmp.c b/modules/access_output/rtmp.c
index b6a2047529e3483b3721d4f243fe66bca959de2d..d40100708056370f02506dccb0a2e54e2b3a0b8f 100644 (file)
--- a/modules/access_output/rtmp.c
+++ b/modules/access_output/rtmp.c
@@ -173,7 +173,7 @@ static int Open( vlc_object_t *p_this )
         p_sys->p_thread->rtmp_headers_send[i].body = NULL;
     }
 
-    vlc_cond_init( p_sys->p_thread, &p_sys->p_thread->wait );
+    vlc_cond_init( &p_sys->p_thread->wait );
     vlc_mutex_init( &p_sys->p_thread->lock );
 
     p_sys->p_thread->result_connect = 1;

diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 680f6e7ac8cbf4b7ba96d136f52489292f37ab76..f576533f7fe636b478c59d021bf6f53867236671 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -316,7 +316,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_ENOMEM;
     p_sys->b_playing = false;
     p_sys->start_date = 0;
-    vlc_cond_init( p_aout, &p_sys->wait );
+    vlc_cond_init( &p_sys->wait );
     vlc_mutex_init( &p_sys->lock );
 
     /* Get device name */

diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c
index d4235a2100e6b0db6a5d715b9a46ceb470ce8b82..22bfd43936b35e05ec71a6c294627bc74a1dd2e6 100644 (file)
--- a/modules/audio_output/auhal.c
+++ b/modules/audio_output/auhal.c
@@ -1181,7 +1181,7 @@ static int AudioStreamChangeFormat( aout_instance_t *p_aout, AudioStreamID i_str
     msg_Dbg( p_aout, STREAM_FORMAT_MSG( "setting stream format: ", change_format ) );
 
     /* Condition because SetProperty is asynchronious */
-    vlc_cond_init( p_aout, &w.cond );
+    vlc_cond_init( &w.cond );
     vlc_mutex_init( &w.lock );
     vlc_mutex_lock( &w.lock );
 

diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c
index 1a95c3e53bb2928b643abb56a1be12cc5712e99f..74afad6048485257111dafe8cd9c3bb7733267e9 100644 (file)
--- a/modules/audio_output/portaudio.c
+++ b/modules/audio_output/portaudio.c
@@ -211,10 +211,10 @@ static int Open( vlc_object_t * p_this )
         pa_thread->p_aout = p_aout;
         pa_thread->b_error = false;
         vlc_mutex_init( &pa_thread->lock_wait );
-        vlc_cond_init( p_aout, &pa_thread->wait );
+        vlc_cond_init( &pa_thread->wait );
         pa_thread->b_wait = false;
         vlc_mutex_init( &pa_thread->lock_signal );
-        vlc_cond_init( p_aout, &pa_thread->signal );
+        vlc_cond_init( &pa_thread->signal );
         pa_thread->b_signal = false;
 
         /* Create PORTAUDIOThread */

diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index 98089fbe13f1f1098742930ec3b08b5a35cd0bbc..cc7c179d1bbf5b05c5c496082a358b135949449b 100644 (file)
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -800,7 +800,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
                                      sizeof(struct thread_context_t) );
             pp_contexts[i]->p_context = p_sys->p_context;
             vlc_mutex_init( &pp_contexts[i]->lock );
-            vlc_cond_init( p_enc, &pp_contexts[i]->cond );
+            vlc_cond_init( &pp_contexts[i]->cond );
             pp_contexts[i]->b_work = 0;
             pp_contexts[i]->b_done = 0;
             if ( vlc_thread_create( pp_contexts[i], "encoder", FfmpegThread,

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index d4730b596edb61c67b9bec335820e1eb285189b6..e15616fec6d672ddd6ac22f5bfc70706026f8f83 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -182,7 +182,7 @@ static int Open( vlc_object_t *p_this )
     p_intf->p_sys = p_sys;
 
     vlc_mutex_init( &p_sys->lock );
-    vlc_cond_init( p_intf, &p_sys->wait );
+    vlc_cond_init( &p_sys->wait );
 
     p_playlist = pl_Yield( p_intf );
     PL_LOCK;

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index e43362aebf9b44401339b45da92777dc3d8eba73..d889dc12211220eabed90666c2356faa650a0fcf 100644 (file)
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -1573,7 +1573,7 @@ static int transcode_video_new( sout_stream_t *p_stream, sout_stream_id_t *id )
                            VLC_THREAD_PRIORITY_VIDEO;
         p_sys->id_video = id;
         vlc_mutex_init( &p_sys->lock_out );
-        vlc_cond_init( p_stream, &p_sys->cond );
+        vlc_cond_init( &p_sys->cond );
         memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) );
         p_sys->i_first_pic = 0;
         p_sys->i_last_pic = 0;

diff --git a/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp b/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp
index 535cc95baeb3d7d4b39dc8035329e657b850f5cd..90465aec3d27ff1d7e272e08c5739a92f37bf343 100644 (file)
--- a/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp
+++ b/modules/video_filter/atmo/AtmoExternalCaptureInput.cpp
@@ -18,7 +18,7 @@ CAtmoExternalCaptureInput::CAtmoExternalCaptureInput(CAtmoDynData *pAtmoDynData)
                            CThread(pAtmoDynData->getAtmoFilter())
 {
     m_pCurrentFramePixels = NULL;
-    vlc_cond_init( this->m_pAtmoThread, &m_WakeupCond );
+    vlc_cond_init( &m_WakeupCond );
     vlc_mutex_init( &m_WakeupLock );
     msg_Dbg( m_pAtmoThread, "CAtmoExternalCaptureInput created.");
 
@@ -142,7 +142,7 @@ DWORD CAtmoExternalCaptureInput::Execute(void)
 */
 #ifdef _ATMO_KLUDGE_
              vlc_cond_destroy( &m_WakeupCond );
-             vlc_cond_init( m_pAtmoThread, &m_WakeupCond );
+             vlc_cond_init( &m_WakeupCond );
 #endif
 #endif
           }

diff --git a/modules/video_filter/atmo/AtmoLiveView.cpp b/modules/video_filter/atmo/AtmoLiveView.cpp
index db1a42e5e54e18a5e4093f35b5ac7ac537bfb119..4ce5ba02e59bad3e257bd7dc04e29b994d196905 100644 (file)
--- a/modules/video_filter/atmo/AtmoLiveView.cpp
+++ b/modules/video_filter/atmo/AtmoLiveView.cpp
@@ -180,7 +180,7 @@ DWORD CAtmoLiveView::Execute(void)
 #ifdef _ATMO_KLUDGE_
                    vlc_mutex_lock( &m_TerminateLock );
                    vlc_cond_destroy( &m_TerminateCond );
-                   vlc_cond_init( m_pAtmoThread, &m_TerminateCond );
+                   vlc_cond_init( &m_TerminateCond );
                    vlc_mutex_unlock( &m_TerminateLock );
 #endif
 #endif

diff --git a/modules/video_filter/atmo/AtmoThread.cpp b/modules/video_filter/atmo/AtmoThread.cpp
index f4f618e0301b7fdcb2a0b5de7e72176170db9592..e3a83d67bc1b9ec61f46fe09c04954517be3e261 100644 (file)
--- a/modules/video_filter/atmo/AtmoThread.cpp
+++ b/modules/video_filter/atmo/AtmoThread.cpp
@@ -22,7 +22,7 @@ CThread::CThread(vlc_object_t *pOwner)
         vlc_object_attach( m_pAtmoThread, m_pOwner);
 
         vlc_mutex_init( &m_TerminateLock );
-        err = vlc_cond_init( m_pAtmoThread, &m_TerminateCond );
+        err = vlc_cond_init( &m_TerminateCond );
         if(err) {
            msg_Err( m_pAtmoThread, "vlc_cond_init failed %d",err);
         }

diff --git a/modules/visualization/goom.c b/modules/visualization/goom.c
index 8dc2f03e0d24cbc9ba744cd56121caf82bf6e530..044dea7a9c2f6a1218a49aa4e3bc7129f49207a0 100644 (file)
--- a/modules/visualization/goom.c
+++ b/modules/visualization/goom.c
@@ -183,7 +183,7 @@ static int Open( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
     vlc_mutex_init( &p_thread->lock );
-    vlc_cond_init( p_filter, &p_thread->wait );
+    vlc_cond_init( &p_thread->wait );
 
     p_thread->i_blocks = 0;
     aout_DateInit( &p_thread->date, p_filter->output.i_rate );

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 133f8fba63f091b95d850a7633da77e8a93ea55f..ce8944ed85686f892da9726724bd59a18a2b3b51 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -427,7 +427,7 @@ VLC_CompileDomain
 VLC_CompileHost
 VLC_Compiler
 __vlc_cond_destroy
-__vlc_cond_init
+vlc_cond_init
 vlc_config_create
 vlc_config_set
 vlc_control_cancel

diff --git a/src/misc/block.c b/src/misc/block.c
index 8c37bcfd22b8a9c7c8c223952b14c95ac75b965e..f85ade12f48c68c75e4cc6de2cde70131eb9297e 100644 (file)
--- a/src/misc/block.c
+++ b/src/misc/block.c
@@ -359,7 +359,7 @@ block_fifo_t *block_FifoNew( void )
         return NULL;
 
     vlc_mutex_init( &p_fifo->lock );
-    vlc_cond_init( NULL, &p_fifo->wait );
+    vlc_cond_init( &p_fifo->wait );
     p_fifo->p_first = NULL;
     p_fifo->pp_last = &p_fifo->p_first;
     p_fifo->i_depth = p_fifo->i_size = 0;

diff --git a/src/misc/objects.c b/src/misc/objects.c
index 83512eeef6bcb06a6dd1f323ad19eefd43d954b3..272fd4c0943bbeaf241e7fe157daac8046127870 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -170,7 +170,7 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
 
     /* Initialize mutexes and condvars */
     vlc_mutex_init( &p_priv->lock );
-    vlc_cond_init( p_new, &p_priv->wait );
+    vlc_cond_init( &p_priv->wait );
     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/threads.c b/src/misc/threads.c
index 7dfcc3321246c5dad41eba5b6cdfd3237bba4dbb..73fd49ab552bd5ee28f371d965d4e89885e71a29 100644 (file)
--- a/src/misc/threads.c
+++ b/src/misc/threads.c
@@ -320,9 +320,9 @@ void __vlc_mutex_destroy( const char * psz_file, int i_line, vlc_mutex_t *p_mute
 }
 
 /*****************************************************************************
- * vlc_cond_init: initialize a condition
+ * vlc_cond_init: initialize a condition variable
  *****************************************************************************/
-int __vlc_cond_init( vlc_cond_t *p_condvar )
+int vlc_cond_init( vlc_cond_t *p_condvar )
 {
 #if defined( LIBVLC_USE_PTHREAD )
     pthread_condattr_t attr;