From: Rémi Denis-Courmont Date: Sat, 6 Sep 2008 13:42:27 +0000 (+0300) Subject: vlc_cond_init: really remove useless parameter X-Git-Tag: 1.0.0-pre1~3494 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5b63839284565821b5aff349378eddbb9d7f1ee0;p=vlc vlc_cond_init: really remove useless parameter --- diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 6539de0fd6..771f33232c 100644 --- 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 c6dd19b4e7..7d9b59ed43 100644 --- 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 64c139d412..416998863c 100644 --- 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 bee0c1b25e..4f16262410 100644 --- 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 b6a2047529..d401007080 100644 --- 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 680f6e7ac8..f576533f7f 100644 --- 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 d4235a2100..22bfd43936 100644 --- 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 1a95c3e53b..74afad6048 100644 --- 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 98089fbe13..cc7c179d1b 100644 --- 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 d4730b596e..e15616fec6 100644 --- 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 e43362aebf..d889dc1221 100644 --- 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 535cc95bae..90465aec3d 100644 --- 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 db1a42e5e5..4ce5ba02e5 100644 --- 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 f4f618e030..e3a83d67bc 100644 --- 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 8dc2f03e0d..044dea7a9c 100644 --- 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 133f8fba63..ce8944ed85 100644 --- 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 8c37bcfd22..f85ade12f4 100644 --- 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 83512eeef6..272fd4c094 100644 --- 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 7dfcc33212..73fd49ab55 100644 --- 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;