VLM class almost done

[vlc] / include / vlc_meta.h

diff --git a/include/vlc_meta.h b/include/vlc_meta.h
index 5949aff081ce1a79b85ee95276f89496a3967899..843266e62040cd4f60f4658039ba0ccaf6d2d43f 100644 (file)
--- a/include/vlc_meta.h
+++ b/include/vlc_meta.h
@@ -95,7 +95,7 @@ struct vlc_meta_t
 
 static inline void vlc_meta_Set( vlc_meta_t * p_meta, vlc_meta_type_t meta_type, const char * psz_val )
 {
-    if( p_meta->ppsz_meta[meta_type] ) free( p_meta->ppsz_meta[meta_type] );
+    free( p_meta->ppsz_meta[meta_type] );
     p_meta->ppsz_meta[meta_type] = psz_val ? strdup( psz_val ) : NULL;
 }
 
@@ -145,7 +145,7 @@ static inline void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
     {
         if( src->ppsz_meta[i] )
         {
-            if( dst->ppsz_meta[i] ) free( dst->ppsz_meta[i] );
+            free( dst->ppsz_meta[i] );
             dst->ppsz_meta[i] = strdup( src->ppsz_meta[i] );
         }
     }
@@ -166,6 +166,7 @@ static inline void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
 /* Shortcuts for the AddInfo */
 #define VLC_META_INFO_CAT           N_("Meta-information")
 #define VLC_META_TITLE              input_MetaTypeToLocalizedString( vlc_meta_Title )
+#define VLC_META_DURATION           N_( "Duration" )
 #define VLC_META_ARTIST             input_MetaTypeToLocalizedString( vlc_meta_Artist )
 #define VLC_META_GENRE              input_MetaTypeToLocalizedString( vlc_meta_Genre )
 #define VLC_META_COPYRIGHT          input_MetaTypeToLocalizedString( vlc_meta_Copyright )
@@ -195,18 +196,19 @@ struct meta_export_t
     const char *psz_file;
 };
 
-#define VLC_META_ENGINE_TITLE           0x00000001
-#define VLC_META_ENGINE_ARTIST          0x00000004
-#define VLC_META_ENGINE_GENRE           0x00000008
-#define VLC_META_ENGINE_COPYRIGHT       0x00000010
-#define VLC_META_ENGINE_COLLECTION      0x00000020
-#define VLC_META_ENGINE_SEQ_NUM         0x00000040
-#define VLC_META_ENGINE_DESCRIPTION     0x00000080
-#define VLC_META_ENGINE_RATING          0x00000100
-#define VLC_META_ENGINE_DATE            0x00000200
-#define VLC_META_ENGINE_URL             0x00000400
-#define VLC_META_ENGINE_LANGUAGE        0x00000800
-#define VLC_META_ENGINE_TRACKID         0x00001000
+#define VLC_META_ENGINE_TRACKID         0x00000001
+#define VLC_META_ENGINE_TITLE           0x00000002
+#define VLC_META_ENGINE_DURATION        0x00000004
+#define VLC_META_ENGINE_ARTIST          0x00000008
+#define VLC_META_ENGINE_GENRE           0x00000010
+#define VLC_META_ENGINE_COPYRIGHT       0x00000020
+#define VLC_META_ENGINE_COLLECTION      0x00000040
+#define VLC_META_ENGINE_SEQ_NUM         0x00000080
+#define VLC_META_ENGINE_DESCRIPTION     0x00000100
+#define VLC_META_ENGINE_RATING          0x00000200
+#define VLC_META_ENGINE_DATE            0x00000400
+#define VLC_META_ENGINE_URL             0x00000800
+#define VLC_META_ENGINE_LANGUAGE        0x00001000
 
 #define VLC_META_ENGINE_ART_URL         0x00002000