* Got rid of more "VideoLAN C*****" references.

[vlc] / include / vlc_meta.h

diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index 9a9a47d253e3689b33e442442c1892874cf9e277..5986bf695e2bc748c71b140d53ee9e6b52ab94ac 100644 (file)
--- a/include/vlc_meta.h
+++ b/include/vlc_meta.h
@@ -34,7 +34,7 @@
 #define VLC_META_RATING             N_("Rating")
 #define VLC_META_DATE               N_("Date")
 #define VLC_META_SETTING            N_("Setting")
-#define VLC_META_URL                N_("Url")
+#define VLC_META_URL                N_("URL")
 #define VLC_META_LANGUAGE           N_("Language")
 #define VLC_META_CODEC_NAME         N_("Codec Name")
 #define VLC_META_CODEC_DESCRIPTION  N_("Codec Description")
@@ -86,13 +86,13 @@ static inline void vlc_meta_Delete( vlc_meta_t *m )
 
 static inline void vlc_meta_Add( vlc_meta_t *m, char *name, char *value )
 {
-    int i_meta = m->i_meta;
+    m->name  = (char**)realloc( m->name, sizeof(char*) * ( m->i_meta + 1 ) );
+    m->name[m->i_meta] = strdup( name );
 
-    name = strdup( name );
-    value = strdup( value );
+    m->value = (char**)realloc( m->value, sizeof(char*) * ( m->i_meta + 1 ) );
+    m->value[m->i_meta] = strdup( value );
 
-    TAB_APPEND( m->i_meta, m->name, name );
-    TAB_APPEND( i_meta,    m->value,value );
+    m->i_meta++;
 }
 
 static inline vlc_meta_t *vlc_meta_Duplicate( vlc_meta_t *src )
@@ -106,7 +106,9 @@ static inline vlc_meta_t *vlc_meta_Duplicate( vlc_meta_t *src )
     for( i = 0; i < src->i_track; i++ )
     {
         vlc_meta_t *tk = vlc_meta_Duplicate( src->track[i] );
-        TAB_APPEND( dst->i_track, dst->track, tk );
+
+        dst->track = (vlc_meta_t**)realloc( dst->track, sizeof( vlc_meta_t* ) * (dst->i_track+1) );
+        dst->track[dst->i_track++] = tk;
     }
     return dst;
 }
@@ -118,16 +120,32 @@ static inline void vlc_meta_Merge( vlc_meta_t *dst, vlc_meta_t *src )
     {
         /* Check if dst contains the entry */
         for( j = 0; j < dst->i_meta; j++ )
-       {
-           if( !strcmp( src->name[i], dst->name[j] ) ) break;
-       }
-       if( j < dst->i_meta )
-       {
-           if( dst->value[j] ) free( dst->value[j] );
-           dst->value[j] = strdup( src->value[i] );
-       }
-       else vlc_meta_Add( dst, src->name[i], src->value[i] );
+        {
+            if( !strcmp( src->name[i], dst->name[j] ) ) break;
+        }
+        if( j < dst->i_meta )
+        {
+            if( dst->value[j] ) free( dst->value[j] );
+            dst->value[j] = strdup( src->value[i] );
+        }
+        else vlc_meta_Add( dst, src->name[i], src->value[i] );
+    }
+}
+
+static inline char *vlc_meta_GetValue( vlc_meta_t *m, char *name )
+{
+    int i;
+
+    for( i = 0; i < m->i_meta; i++ )
+    {
+        if( !strcmp( m->name[i], name ) )
+        {
+            char *value = NULL;
+            if( m->value[i] ) value = strdup( m->value[i] );
+            return value;
+        }
     }
+    return NULL;
 }
 
 #endif