VLC_EXPORT (void, vlc_control_cancel, (int cmd, ...));
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 );
+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, (vlc_timer_t) LIBVLC_USED );
#ifndef LIBVLC_USE_PTHREAD_CANCEL
enum {
/* Stop still image handler */
if( p_sys->still.b_created )
- vlc_timer_destroy( &p_sys->still.timer );
+ vlc_timer_destroy( p_sys->still.timer );
vlc_mutex_destroy( &p_sys->still.lock );
var_Destroy( p_sys->p_input, "highlight-mutex" );
if( event->length != 0xff && p_sys->still.b_created )
{
mtime_t delay = event->length * CLOCK_FREQ;
- vlc_timer_schedule( &p_sys->still.timer, false, delay, 0 );
+ vlc_timer_schedule( p_sys->still.timer, false, delay, 0 );
}
b_still_init = true;
static void timer_cleanup (void *timer)
{
- vlc_timer_destroy (timer);
+ vlc_timer_destroy ((vlc_timer_t)timer);
}
static void rtp_process (void *data);
if (vlc_timer_create (&p_sys->timer, rtp_process, data))
return NULL;
- vlc_cleanup_push (timer_cleanup, &p_sys->timer);
+ vlc_cleanup_push (timer_cleanup, (void *)p_sys->timer);
for (;;)
{
vlc_mutex_lock (&p_sys->lock);
if (rtp_dequeue (demux, p_sys->session, &deadline))
- vlc_timer_schedule (&p_sys->timer, true, deadline, 0);
+ vlc_timer_schedule (p_sys->timer, true, deadline, 0);
vlc_mutex_unlock (&p_sys->lock);
}
vlc_mutex_init (&p_sys->lock);
if (vlc_timer_create (&p_sys->timer, Demux, demux))
goto error;
- vlc_timer_schedule (&p_sys->timer, false, 1, p_sys->interval);
+ vlc_timer_schedule (p_sys->timer, false, 1, p_sys->interval);
/* Initializes demux */
demux->pf_demux = NULL;
demux_t *demux = (demux_t *)obj;
demux_sys_t *p_sys = demux->p_sys;
- vlc_timer_destroy (&p_sys->timer);
+ vlc_timer_destroy (p_sys->timer);
vlc_mutex_destroy (&p_sys->lock);
xcb_disconnect (p_sys->conn);
free (p_sys);
es_out_Control (demux->out, ES_OUT_RESET_PCR);
vlc_mutex_unlock (&p_sys->lock);
}
- vlc_timer_schedule (&p_sys->timer, false,
+ vlc_timer_schedule (p_sys->timer, false,
pausing ? 0 : 1, p_sys->interval);
return VLC_SUCCESS;
}
free( p_sys );
return VLC_ENOMEM;
}
- vlc_timer_schedule( &p_sys->timer, false, 30*CLOCK_FREQ, 30*CLOCK_FREQ );
+ vlc_timer_schedule( p_sys->timer, false, 30*CLOCK_FREQ, 30*CLOCK_FREQ );
#ifdef HAVE_DBUS
p_sys->p_connection = dbus_init( p_intf );
intf_thread_t *p_intf = (intf_thread_t*)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
- vlc_timer_destroy( &p_sys->timer );
+ vlc_timer_destroy( p_sys->timer );
#ifdef HAVE_DBUS
if( p_sys->p_connection )
dbus_connection_unref( p_sys->p_connection );
* @warning This function <b>must</b> be called before the timer data can be
* freed and before the timer callback function can be unloaded.
*
- * @param timer to destroy
+ * @param timer timer to destroy
*/
-void vlc_timer_destroy (vlc_timer_t *id)
+void vlc_timer_destroy (vlc_timer_t timer)
{
- struct vlc_timer *timer = *id;
-
- vlc_timer_schedule (id, false, 0, 0);
+ vlc_timer_schedule (timer, false, 0, 0);
vlc_mutex_lock (&timer->lock);
while (timer->users != 0)
vlc_cond_wait (&timer->wait, &timer->lock);
* the system is busy or suspended, or because a previous iteration of the
* timer is still running. See also vlc_timer_getoverrun().
*
- * @param id initialized timer pointer
+ * @param timer initialized timer
* @param absolute the timer value origin is the same as mdate() if true,
* the timer value is relative to now if false.
* @param value zero to disarm the timer, otherwise the initial time to wait
* @param interval zero to fire the timer just once, otherwise the timer
* repetition interval.
*/
-void vlc_timer_schedule (vlc_timer_t *id, bool absolute,
+void vlc_timer_schedule (vlc_timer_t timer, bool absolute,
mtime_t value, mtime_t interval)
{
- struct vlc_timer *timer = *id;
-
vlc_mutex_lock (&timer->lock);
if (timer->value)
{
/**
* Fetch and reset the overrun counter for a timer.
- * @param id initialized timer pointer
+ * @param timer initialized timer
* @return the timer overrun counter, i.e. the number of times that the timer
* should have run but did not since the last actual run. If all is well, this
* is zero.
*/
-unsigned vlc_timer_getoverrun (const vlc_timer_t *id)
+unsigned vlc_timer_getoverrun (vlc_timer_t timer)
{
- struct vlc_timer *timer = *id;
unsigned ret;
vlc_mutex_lock (&timer->lock);
return 0;
}
-void vlc_timer_destroy (vlc_timer_t *id)
+void vlc_timer_destroy (vlc_timer_t timer)
{
- struct vlc_timer *timer = *id;
-
if (timer->handle != INVALID_HANDLE_VALUE)
DeleteTimerQueueTimer (NULL, timer->handle, INVALID_HANDLE_VALUE);
free (timer);
}
-void vlc_timer_schedule (vlc_timer_t *id, bool absolute,
+void vlc_timer_schedule (vlc_timer_t timer, bool absolute,
mtime_t value, mtime_t interval)
{
- struct vlc_timer *timer = *id;
-
if (timer->handle != INVALID_HANDLE_VALUE)
{
DeleteTimerQueueTimer (NULL, timer->handle, NULL);
abort ();
}
-unsigned vlc_timer_getoverrun (const vlc_timer_t *id)
+unsigned vlc_timer_getoverrun (vlc_timer_t timer)
{
- (void)id;
+ (void)timer;
return 0;
}
struct timer_data *data = ptr;
vlc_mutex_lock (&data->lock);
- data->count += 1 + vlc_timer_getoverrun (&data->timer);
+ data->count += 1 + vlc_timer_getoverrun (data->timer);
vlc_mutex_unlock (&data->lock);
}
assert (val == 0);
/* Relative timer */
- vlc_timer_schedule (&data.timer, false, 1, CLOCK_FREQ / 10);
+ vlc_timer_schedule (data.timer, false, 1, CLOCK_FREQ / 10);
msleep (CLOCK_FREQ);
vlc_mutex_lock (&data.lock);
- data.count += vlc_timer_getoverrun (&data.timer);
+ data.count += vlc_timer_getoverrun (data.timer);
printf ("Count = %u\n", data.count);
assert (data.count >= 10);
data.count = 0;
vlc_mutex_unlock (&data.lock);
- vlc_timer_schedule (&data.timer, false, 0, 0);
+ vlc_timer_schedule (data.timer, false, 0, 0);
/* Absolute timer */
mtime_t now = mdate ();
- vlc_timer_schedule (&data.timer, true, now, CLOCK_FREQ / 10);
+ vlc_timer_schedule (data.timer, true, now, CLOCK_FREQ / 10);
msleep (CLOCK_FREQ);
vlc_mutex_lock (&data.lock);
- data.count += vlc_timer_getoverrun (&data.timer);
+ data.count += vlc_timer_getoverrun (data.timer);
printf ("Count = %u\n", data.count);
assert (data.count >= 10);
vlc_mutex_unlock (&data.lock);
- vlc_timer_destroy (&data.timer);
+ vlc_timer_destroy (data.timer);
vlc_mutex_destroy (&data.lock);
return 0;