/* VLC meta name */
#define VLC_META_INFO_CAT N_("Meta-information")
#define VLC_META_TITLE N_("Title")
-#define VLC_META_AUTHOR N_("Author")
#define VLC_META_ARTIST N_("Artist")
#define VLC_META_GENRE N_("Genre")
#define VLC_META_COPYRIGHT N_("Copyright")
#define VLC_META_LANGUAGE N_("Language")
#define VLC_META_NOW_PLAYING N_("Now Playing")
#define VLC_META_PUBLISHER N_("Publisher")
+#define VLC_META_ENCODED_BY N_("Encoded by")
-#define VLC_META_CDDB_ARTIST N_("CDDB Artist")
-#define VLC_META_CDDB_CATEGORY N_("CDDB Category")
-#define VLC_META_CDDB_DISCID N_("CDDB Disc ID")
-#define VLC_META_CDDB_EXT_DATA N_("CDDB Extended Data")
-#define VLC_META_CDDB_GENRE N_("CDDB Genre")
-#define VLC_META_CDDB_YEAR N_("CDDB Year")
-#define VLC_META_CDDB_TITLE N_("CDDB Title")
-
-#define VLC_META_CDTEXT_ARRANGER N_("CD-Text Arranger")
-#define VLC_META_CDTEXT_COMPOSER N_("CD-Text Composer")
-#define VLC_META_CDTEXT_DISCID N_("CD-Text Disc ID")
-#define VLC_META_CDTEXT_GENRE N_("CD-Text Genre")
-#define VLC_META_CDTEXT_MESSAGE N_("CD-Text Message")
-#define VLC_META_CDTEXT_SONGWRITER N_("CD-Text Songwriter")
-#define VLC_META_CDTEXT_PERFORMER N_("CD-Text Performer")
-#define VLC_META_CDTEXT_TITLE N_("CD-Text Title")
-
-#define VLC_META_ISO_APPLICATION_ID N_("ISO-9660 Application ID")
-#define VLC_META_ISO_PREPARER N_("ISO-9660 Preparer")
-#define VLC_META_ISO_PUBLISHER N_("ISO-9660 Publisher")
-#define VLC_META_ISO_VOLUME N_("ISO-9660 Volume")
-#define VLC_META_ISO_VOLUMESET N_("ISO-9660 Volume Set")
+#define VLC_META_ART_URL N_("Art URL")
#define VLC_META_CODEC_NAME N_("Codec Name")
#define VLC_META_CODEC_DESCRIPTION N_("Codec Description")
+#define ITEM_PREPARSED 0x01
+#define ITEM_META_FETCHED 0x02
+#define ITEM_ARTURL_FETCHED 0x04
+#define ITEM_ART_FETCHED 0x08
+
struct vlc_meta_t
{
- /* meta name/value pairs */
- int i_meta;
- char **name;
- char **value;
-
+ char *psz_title;
+ char *psz_artist;
+ char *psz_genre;
+ char *psz_copyright;
+ char *psz_album;
+ char *psz_tracknum;
+ char *psz_description;
+ char *psz_rating;
+ char *psz_date;
+ char *psz_setting;
+ char *psz_url;
+ char *psz_language;
+ char *psz_nowplaying;
+ char *psz_publisher;
+ char *psz_encodedby;
+ char *psz_arturl;
+
+ int i_status;
+#if 0
/* track meta information */
int i_track;
vlc_meta_t **track;
+#endif
};
+#define vlc_meta_Set( meta,var,val ) { \
+ if( meta->psz_##var ) free( meta->psz_##var ); \
+ meta->psz_##var = strdup( val ); }
+
+#define vlc_meta_SetTitle( meta, b ) vlc_meta_Set( meta, title, b );
+#define vlc_meta_SetArtist( meta, b ) vlc_meta_Set( meta, artist, b );
+#define vlc_meta_SetGenre( meta, b ) vlc_meta_Set( meta, genre, b );
+#define vlc_meta_SetCopyright( meta, b ) vlc_meta_Set( meta, copyright, b );
+#define vlc_meta_SetAlbum( meta, b ) vlc_meta_Set( meta, album, b );
+#define vlc_meta_SetTracknum( meta, b ) vlc_meta_Set( meta, tracknum, b );
+#define vlc_meta_SetDescription( meta, b ) vlc_meta_Set( meta, description, b );
+#define vlc_meta_SetRating( meta, b ) vlc_meta_Set( meta, rating, b );
+#define vlc_meta_SetDate( meta, b ) vlc_meta_Set( meta, date, b );
+#define vlc_meta_SetSetting( meta, b ) vlc_meta_Set( meta, setting, b );
+#define vlc_meta_SetURL( meta, b ) vlc_meta_Set( meta, url, b );
+#define vlc_meta_SetLanguage( meta, b ) vlc_meta_Set( meta, language, b );
+#define vlc_meta_SetNowPlaying( meta, b ) vlc_meta_Set( meta, nowplaying, b );
+#define vlc_meta_SetPublisher( meta, b ) vlc_meta_Set( meta, publisher, b );
+#define vlc_meta_SetEncodedBy( meta, b ) vlc_meta_Set( meta, encodedby, b );
+#define vlc_meta_SetArtURL( meta, b ) vlc_meta_Set( meta, arturl, b );
+
static inline vlc_meta_t *vlc_meta_New( void )
{
vlc_meta_t *m = (vlc_meta_t*)malloc( sizeof( vlc_meta_t ) );
-
- m->i_meta = 0;
- m->name = NULL;
- m->value = NULL;
-
- m->i_track= 0;
- m->track = NULL;
-
+ if( !m ) return NULL;
+ m->psz_title = NULL;
+ m->psz_artist = NULL;
+ m->psz_genre = NULL;
+ m->psz_copyright = NULL;
+ m->psz_album = NULL;
+ m->psz_tracknum = NULL;
+ m->psz_description = NULL;
+ m->psz_rating = NULL;
+ m->psz_date = NULL;
+ m->psz_setting = NULL;
+ m->psz_url = NULL;
+ m->psz_language = NULL;
+ m->psz_nowplaying = NULL;
+ m->psz_publisher = NULL;
+ m->psz_encodedby = NULL;
+ m->psz_arturl = NULL;
+ m->i_status = 0;
return m;
}
static inline void vlc_meta_Delete( vlc_meta_t *m )
{
- int i;
- for( i = 0; i < m->i_meta; i++ )
- {
- free( m->name[i] );
- free( m->value[i] );
- }
- if( m->name ) free( m->name );
- if( m->value ) free( m->value );
+ free( m->psz_title );
+ free( m->psz_artist );
+ free( m->psz_genre );
+ free( m->psz_copyright );
+ free( m->psz_album );
+ free( m->psz_tracknum );
+ free( m->psz_description );
+ free( m->psz_rating );
+ free( m->psz_date );
+ free( m->psz_setting );
+ free( m->psz_url );
+ free( m->psz_language );
+ free( m->psz_nowplaying );
+ free( m->psz_publisher );
+ free( m->psz_encodedby );
+ free( m->psz_arturl );
- for( i = 0; i < m->i_track; i++ )
- {
- vlc_meta_Delete( m->track[i] );
- }
- if( m->track ) free( m->track );
free( m );
}
-static inline void vlc_meta_Add( vlc_meta_t *m,
- const char *name, const char *value )
+static inline void vlc_meta_Merge( vlc_meta_t *dst, vlc_meta_t *src )
{
- m->name = (char**)realloc( m->name, sizeof(char*) * ( m->i_meta + 1 ) );
- m->name[m->i_meta] = strdup( name );
-
- m->value = (char**)realloc( m->value, sizeof(char*) * ( m->i_meta + 1 ) );
- m->value[m->i_meta] = strdup( value );
-
- m->i_meta++;
+ if( !dst || !src ) return;
+#define COPY_FIELD( a ) \
+ if( src->psz_ ## a ) { \
+ if( dst->psz_ ## a ) free( dst->psz_## a ); \
+ dst->psz_##a = strdup( src->psz_##a ); \
+ }
+ COPY_FIELD( title );
+ COPY_FIELD( artist );
+ COPY_FIELD( genre );
+ COPY_FIELD( copyright );
+ COPY_FIELD( album );
+ COPY_FIELD( tracknum );
+ COPY_FIELD( description );
+ COPY_FIELD( rating );
+ COPY_FIELD( date );
+ COPY_FIELD( setting );
+ COPY_FIELD( url );
+ COPY_FIELD( language );
+ COPY_FIELD( nowplaying );
+ COPY_FIELD( publisher );
+ COPY_FIELD( encodedby );
+ COPY_FIELD( arturl );
}
+ /** \todo Track meta */
+
+enum {
+ ALBUM_ART_NEVER,
+ ALBUM_ART_WHEN_ASKED,
+ ALBUM_ART_WHEN_PLAYED,
+ ALBUM_ART_ALL };
-static inline vlc_meta_t *vlc_meta_Duplicate( vlc_meta_t *src )
+struct meta_export_t
{
- vlc_meta_t *dst = vlc_meta_New();
- int i;
- for( i = 0; i < src->i_meta; i++ )
- {
- vlc_meta_Add( dst, src->name[i], src->value[i] );
- }
- for( i = 0; i < src->i_track; i++ )
- {
- vlc_meta_t *tk = vlc_meta_Duplicate( src->track[i] );
+ input_item_t *p_item;
+ const char *psz_file;
+};
- dst->track = (vlc_meta_t**)realloc( dst->track, sizeof( vlc_meta_t* ) * (dst->i_track+1) );
- dst->track[dst->i_track++] = tk;
- }
- return dst;
-}
+#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
-static inline void vlc_meta_Merge( vlc_meta_t *dst, vlc_meta_t *src )
-{
- int i, j;
- for( i = 0; i < src->i_meta; i++ )
- {
- /* 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] );
- }
-}
+#define VLC_META_ENGINE_ART_URL 0x00001000
+
+#define VLC_META_ENGINE_MB_ARTIST_ID 0x00002000
+#define VLC_META_ENGINE_MB_RELEASE_ID 0x00004000
+#define VLC_META_ENGINE_MB_TRACK_ID 0x00008000
+#define VLC_META_ENGINE_MB_TRM_ID 0x00010000
+
+typedef struct meta_engine_sys_t meta_engine_sys_t;
-static inline char *vlc_meta_GetValue( vlc_meta_t *m, const char *name )
+struct meta_engine_t
{
- 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;
-}
+ VLC_COMMON_MEMBERS
+
+ module_t *p_module;
+
+ uint32_t i_mandatory; /**< Stuff which we really need to get */
+ uint32_t i_optional; /**< Stuff which we'd like to have */
+
+ input_item_t *p_item;
+};
+
+VLC_EXPORT(uint32_t, input_CurrentMetaFlags,( vlc_meta_t *p_meta ) );
#endif
projects / vlc / blobdiff