struct vlc_timer_t
{
timer_t handle;
- void (*func) (vlc_timer_t *, void *);
+ void (*func) (void *);
void *data;
};
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 );
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 * );
/*****************************************************************************
* 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;
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,
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
* 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 );
Execute( p_intf, ppsz_gsargs );
#endif
/* FIXME: add support for other screensavers */
-
- (void)id;
}
#ifdef HAVE_DBUS
static void vlc_timer_do (union sigval val)
{
vlc_timer_t *id = val.sival_ptr;
- id->func (id, id->data);
+ id->func (id->data);
}
/**
* @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;
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;