From 3e649d208889684211a788061134c6bc0c173b15 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 3 Jun 2009 19:03:55 +0300 Subject: [PATCH] Remove useless timer parameter --- include/vlc_threads.h | 4 ++-- modules/access/dvdnav.c | 6 ++---- modules/misc/screensaver.c | 6 ++---- src/misc/pthread.c | 5 ++--- src/misc/w32thread.c | 5 ++--- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/include/vlc_threads.h b/include/vlc_threads.h index 8cf3d37a5f..316bf73f7f 100644 --- a/include/vlc_threads.h +++ b/include/vlc_threads.h @@ -112,7 +112,7 @@ typedef struct vlc_timer_t vlc_timer_t; struct vlc_timer_t { timer_t handle; - void (*func) (vlc_timer_t *, void *); + void (*func) (void *); void *data; }; @@ -181,7 +181,7 @@ VLC_EXPORT( void, vlc_cancel, (vlc_thread_t) ); VLC_EXPORT( void, vlc_join, (vlc_thread_t, void **) ); VLC_EXPORT (void, vlc_control_cancel, (int cmd, ...)); -VLC_EXPORT( int, vlc_timer_create, (vlc_timer_t *, void (*) (vlc_timer_t *, void *), void *) LIBVLC_USED ); +VLC_EXPORT( int, vlc_timer_create, (vlc_timer_t *, void (*) (void *), void *) LIBVLC_USED ); VLC_EXPORT( void, vlc_timer_destroy, (vlc_timer_t *) ); VLC_EXPORT( void, vlc_timer_schedule, (vlc_timer_t *, bool, mtime_t, mtime_t) ); VLC_EXPORT( unsigned, vlc_timer_getoverrun, (const vlc_timer_t *) LIBVLC_USED ); diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 2d49fbeef0..6d0f2a6ebd 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -163,7 +163,7 @@ static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var ); static int ControlInternal( demux_t *, int, ... ); -static void StillTimer( vlc_timer_t *, void * ); +static void StillTimer( void * ); static int EventKey( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); @@ -1300,7 +1300,7 @@ static void ESNew( demux_t *p_demux, int i_id ) /***************************************************************************** * Still image end *****************************************************************************/ -static void StillTimer( vlc_timer_t *id, void *p_data ) +static void StillTimer( void *p_data ) { demux_sys_t *p_sys = p_data; @@ -1309,8 +1309,6 @@ static void StillTimer( vlc_timer_t *id, void *p_data ) p_sys->still.b_enabled = false; dvdnav_still_skip( p_sys->dvdnav ); vlc_mutex_unlock( &p_sys->still.lock ); - - (void) id; } static int EventMouse( vlc_object_t *p_vout, char const *psz_var, diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c index 902e8d571c..7abfea1e32 100644 --- a/modules/misc/screensaver.c +++ b/modules/misc/screensaver.c @@ -61,7 +61,7 @@ static int Activate ( vlc_object_t * ); static void Deactivate ( vlc_object_t * ); -static void Timer( vlc_timer_t *, void * ); +static void Timer( void * ); #ifdef HAVE_DBUS @@ -176,7 +176,7 @@ static void Execute( intf_thread_t *p_this, const char *const *ppsz_args ) * This part of the module is in a separate thread so that we do not have * too much system() overhead. *****************************************************************************/ -static void Timer( vlc_timer_t *id, void *data ) +static void Timer( void *data ) { intf_thread_t *p_intf = data; playlist_t *p_playlist = pl_Hold( p_intf ); @@ -211,8 +211,6 @@ static void Timer( vlc_timer_t *id, void *data ) Execute( p_intf, ppsz_gsargs ); #endif /* FIXME: add support for other screensavers */ - - (void)id; } #ifdef HAVE_DBUS diff --git a/src/misc/pthread.c b/src/misc/pthread.c index be39b1b531..7efa53d64d 100644 --- a/src/misc/pthread.c +++ b/src/misc/pthread.c @@ -588,7 +588,7 @@ void vlc_control_cancel (int cmd, ...) static void vlc_timer_do (union sigval val) { vlc_timer_t *id = val.sival_ptr; - id->func (id, id->data); + id->func (id->data); } /** @@ -601,8 +601,7 @@ static void vlc_timer_do (union sigval val) * @param data parameter for the timer function * @return 0 on success, a system error code otherwise. */ -int vlc_timer_create (vlc_timer_t *id, void (*func) (vlc_timer_t *, void *), - void *data) +int vlc_timer_create (vlc_timer_t *id, void (*func) (void *), void *data) { struct sigevent ev; diff --git a/src/misc/w32thread.c b/src/misc/w32thread.c index 60f72c7f86..24f991e04d 100644 --- a/src/misc/w32thread.c +++ b/src/misc/w32thread.c @@ -521,15 +521,14 @@ static void CALLBACK vlc_timer_do (void *val, BOOLEAN timeout) if (TryEnterCriticalSection (&id->serializer)) { id->overrun = InterlockedExchange (&id->counter, 0); - id->func (id, id->data); + id->func (id->data); LeaveCriticalSection (&id->serializer); } else /* Overrun */ InterlockedIncrement (&id->counter); } -int vlc_timer_create (vlc_timer_t *id, void (*func) (vlc_timer_t *, void *), - void *data) +int vlc_timer_create (vlc_timer_t *id, void (*func) (void *), void *data) { id->func = func; id->data = data; -- 2.20.1