[vlc-commits] Remove unused timer instance data

Rémi Denis-Courmont git at videolan.org
Tue Nov 29 18:46:39 CET 2011


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 29 19:46:06 2011 +0200| [c5dac996061594e526fff114b4fd08a4fde865a4] | committer: Rémi Denis-Courmont

Remove unused timer instance data

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c5dac996061594e526fff114b4fd08a4fde865a4
---

 src/libvlc.c |    4 ----
 src/libvlc.h |    5 -----
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/src/libvlc.c b/src/libvlc.c
index b84ed01..04aeb2e 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -193,7 +193,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
 
     /* Initialize mutexes */
     vlc_mutex_init( &priv->ml_lock );
-    vlc_mutex_init( &priv->timer_lock );
     vlc_ExitInit( &priv->exit );
 
     return p_libvlc;
@@ -518,8 +517,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     vlc_object_set_name( p_libvlc, "main" );
 
     priv->b_stats = var_InheritBool( p_libvlc, "stats" );
-    priv->i_timers = 0;
-    priv->pp_timers = NULL;
 
     /*
      * Initialize hotkey handling
@@ -822,7 +819,6 @@ void libvlc_InternalDestroy( libvlc_int_t *p_libvlc )
 
     /* Destroy mutexes */
     vlc_ExitDestroy( &priv->exit );
-    vlc_mutex_destroy( &priv->timer_lock );
     vlc_mutex_destroy( &priv->ml_lock );
 
 #ifndef NDEBUG /* Hack to dump leaked objects tree */
diff --git a/src/libvlc.h b/src/libvlc.h
index ad0c68e..5cb1ac8 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -174,12 +174,7 @@ typedef struct libvlc_priv_t
     /* Messages */
     int                i_verbose;   ///< info messages
     bool               b_color;     ///< color messages?
-
-    /* Timer stats */
     bool               b_stats;     ///< Whether to collect stats
-    vlc_mutex_t        timer_lock;  ///< Lock to protect timers
-    counter_t        **pp_timers;   ///< Array of all timers
-    int                i_timers;    ///< Number of timers
 
     /* Singleton objects */
     module_t          *p_memcpy_module;  ///< Fast memcpy plugin used



More information about the vlc-commits mailing list