Cleanup vlc_timer_* prototypes

diff --git a/include/vlc_threads.h b/include/vlc_threads.h
index eb27c498d8e04702f3383b8d91fac473cf9e1a6f..77a7608785ceb3d49c3e77dbd9eb4aeed2d7fe09 100644 (file)
--- a/include/vlc_threads.h
+++ b/include/vlc_threads.h
@@ -175,9 +175,9 @@ 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 (*) (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 {

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 647708fc7eac6f5fa3f9b8b81e87233ec92caed1..b226b56a8709a6c77511b158f02d6fe99fb5dd5d 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -385,7 +385,7 @@ static void Close( vlc_object_t *p_this )
 
     /* 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" );
@@ -638,7 +638,7 @@ static int Demux( demux_t *p_demux )
             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;

diff --git a/modules/access/rtp/input.c b/modules/access/rtp/input.c
index e8bbad44cbb7d52ec4162712267bf176e93bbc23..a2aa4a2ce110583eb55e77eb0dc44c375bfc8874 100644 (file)
--- a/modules/access/rtp/input.c
+++ b/modules/access/rtp/input.c
@@ -163,7 +163,7 @@ static block_t *rtp_recv (demux_t *demux)
 
 static void timer_cleanup (void *timer)
 {
-    vlc_timer_destroy (timer);
+    vlc_timer_destroy ((vlc_timer_t)timer);
 }
 
 static void rtp_process (void *data);
@@ -176,7 +176,7 @@ void *rtp_thread (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 (;;)
     {
@@ -217,6 +217,6 @@ static void rtp_process (void *data)
 
     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);
 }

diff --git a/modules/access/screen/xcb.c b/modules/access/screen/xcb.c
index 9bedaa15f46abe6058015cde48de38c3069187ab..de35fd87d1ab9c29c026731a5395cdf6b23eaa22 100644 (file)
--- a/modules/access/screen/xcb.c
+++ b/modules/access/screen/xcb.c
@@ -244,7 +244,7 @@ static int Open (vlc_object_t *obj)
     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;
@@ -266,7 +266,7 @@ static void Close (vlc_object_t *obj)
     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);
@@ -324,7 +324,7 @@ static int Control (demux_t *demux, int query, va_list args)
                 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;
         }

diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 7abfea1e32f461cbbb1840476dcd40c470de1606..4667585d77dc565473f1d3a2d848ea2c4dc54e30 100644 (file)
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -112,7 +112,7 @@ static int Activate( vlc_object_t *p_this )
         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 );
@@ -128,7 +128,7 @@ static void Deactivate( vlc_object_t *p_this )
     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 );

diff --git a/src/misc/pthread.c b/src/misc/pthread.c
index 58b2c8fbd3d983dcf0b36900bdfaaee5e9cbc595..ceac6fca1ab3643ee38806f4bded69d0796b0313 100644 (file)
--- a/src/misc/pthread.c
+++ b/src/misc/pthread.c
@@ -775,13 +775,11 @@ int vlc_timer_create (vlc_timer_t *id, void (*func) (void *), void *data)
  * @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);
@@ -801,7 +799,7 @@ void vlc_timer_destroy (vlc_timer_t *id)
  * 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
@@ -809,11 +807,9 @@ void vlc_timer_destroy (vlc_timer_t *id)
  * @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)
     {
@@ -833,14 +829,13 @@ void vlc_timer_schedule (vlc_timer_t *id, bool absolute,
 
 /**
  * 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);

diff --git a/src/misc/w32thread.c b/src/misc/w32thread.c
index c461090863dca307b762b3a3b868b074e8524ea3..8f04a3da9a54f777a002e905087ef3cd6436811e 100644 (file)
--- a/src/misc/w32thread.c
+++ b/src/misc/w32thread.c
@@ -629,20 +629,16 @@ int vlc_timer_create (vlc_timer_t *id, void (*func) (void *), void *data)
     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);
@@ -660,8 +656,8 @@ void vlc_timer_schedule (vlc_timer_t *id, bool absolute,
         abort ();
 }
 
-unsigned vlc_timer_getoverrun (const vlc_timer_t *id)
+unsigned vlc_timer_getoverrun (vlc_timer_t timer)
 {
-    (void)id;
+    (void)timer;
     return 0;
 }

diff --git a/src/test/timer.c b/src/test/timer.c
index 00a806c7bd5ced2ba8db28f49ea54456cc01f78d..c50da1d7c794d4f81e5c1b1177486b24e4aa208f 100644 (file)
--- a/src/test/timer.c
+++ b/src/test/timer.c
@@ -41,7 +41,7 @@ static void callback (void *ptr)
     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);
 }
 
@@ -58,28 +58,28 @@ int main (void)
     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;