You still need the cast to compile :)

[vlc] / include / vlc_arrays.h

diff --git a/include/vlc_arrays.h b/include/vlc_arrays.h
index 7db0794855c009b19193b57c1e3d4749b5588bef..580bbd05c282e9b584e7f33dc0089179489bceb5 100644 (file)
--- a/include/vlc_arrays.h
+++ b/include/vlc_arrays.h
@@ -2,7 +2,7 @@
  * vlc_arrays.h : Arrays and data structures handling
  *****************************************************************************
  * Copyright (C) 1999-2004 the VideoLAN team
- * $Id: vlc_playlist.h 17108 2006-10-15 15:28:34Z zorglub $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Clément Stenac <zorglub@videolan.org>
@@ -220,6 +220,7 @@
     }                                                                       \
 }
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 /* API */
 #define DECL_ARRAY(type) struct {                                           \
@@ -300,6 +301,20 @@ static inline void vlc_array_clear( vlc_array_t * p_array )
     memset( p_array, 0, sizeof(vlc_array_t) );
 }
 
+static inline vlc_array_t * vlc_array_new( void )
+{
+    vlc_array_t * ret = (vlc_array_t *)malloc( sizeof(vlc_array_t) );
+    vlc_array_init( ret );
+    return ret;
+}
+
+static inline void vlc_array_destroy( vlc_array_t * p_array )
+{
+    vlc_array_clear( p_array );
+    free( p_array );
+}
+
+
 /* Read */
 static inline int
 vlc_array_count( vlc_array_t * p_array )
@@ -308,16 +323,28 @@ vlc_array_count( vlc_array_t * p_array )
 }
 
 static inline void *
-vlc_array_object_at_index( vlc_array_t * p_array, int i_index )
+vlc_array_item_at_index( vlc_array_t * p_array, int i_index )
 {
     return p_array->pp_elems[i_index];
 }
 
+static inline int
+vlc_array_index_of_item( vlc_array_t * p_array, void * item )
+{
+    int i;
+    for( i = 0; i < p_array->i_count; i++)
+    {
+        if( p_array->pp_elems[i] == item )
+            return i;
+    }
+    return -1;
+}
+
 /* Write */
 static inline void
 vlc_array_insert( vlc_array_t * p_array, void * p_elem, int i_index )
 {
-    TAB_INSERT( p_array->i_count, p_array->pp_elems, p_elem, i_index );
+    TAB_INSERT_CAST( (void **), p_array->i_count, p_array->pp_elems, p_elem, i_index );
 }
 
 static inline void
@@ -465,7 +492,7 @@ vlc_dictionary_all_keys( const vlc_dictionary_t * p_dict )
 
     ppsz_ret = (char**)malloc(sizeof(char *) * (count + 1));
     assert( ppsz_ret );
- 
+
     count = 0;
     for( i = 0; i < p_dict->i_size; i++ )
     {
@@ -528,7 +555,7 @@ __vlc_dictionary_insert( vlc_dictionary_t * p_dict, const char * psz_key,
             struct vlc_dictionary_t new_dict;
             int i_new_size = ( (p_dict->i_size+2) * 3) / 2; /* XXX: this need tuning */
             int i;
- 
+
             vlc_dictionary_init( &new_dict, i_new_size );
             for( i = 0; i < p_dict->i_size; i++ )
             {