* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc_input.h>
-#include <vlc_stream.h>
-#include <vlc_meta.h>
-#include <vlc_playlist.h>
-#include <vlc_charset.h>
-#include <vlc_strings.h>
-#include "../playlist/playlist_internal.h"
-#include <errno.h>
-#include <limits.h> /* PATH_MAX */
-
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-static const char * meta_type_to_string[VLC_META_TYPE_COUNT] =
-{
- [vlc_meta_Title] = N_("Title"),
- [vlc_meta_Artist] = N_("Artist"),
- [vlc_meta_Genre] = N_("Genre"),
- [vlc_meta_Copyright] = N_("Copyright"),
- [vlc_meta_Album] = N_("Album"),
- [vlc_meta_TrackNumber] = N_("Track number"),
- [vlc_meta_Description] = N_("Description"),
- [vlc_meta_Rating] = N_("Rating"),
- [vlc_meta_Date] = N_("Date"),
- [vlc_meta_Setting] = N_("Setting"),
- [vlc_meta_URL] = N_("URL"),
- [vlc_meta_Language] = N_("Language"),
- [vlc_meta_NowPlaying] = N_("Now Playing"),
- [vlc_meta_Publisher] = N_("Publisher"),
- [vlc_meta_EncodedBy] = N_("Encoded by"),
- [vlc_meta_ArtworkURL] = N_("Artwork URL"),
- [vlc_meta_TrackID] = N_("Track ID"),
-};
-
-const char *
-input_MetaTypeToLocalizedString( vlc_meta_type_t meta_type )
-{
- return _(meta_type_to_string[meta_type]);
-}
+#include <vlc_common.h>
+#include <vlc_playlist.h>
+#include <vlc_url.h>
+#include <vlc_arrays.h>
+#include <vlc_modules.h>
-#define input_FindArtInCache(a,b) __input_FindArtInCache(VLC_OBJECT(a),b)
-static int __input_FindArtInCache( vlc_object_t *, input_item_t *p_item );
+#include "input_internal.h"
+#include "../playlist/art.h"
-vlc_bool_t input_MetaSatisfied( playlist_t *p_playlist, input_item_t *p_item,
- uint32_t *pi_mandatory, uint32_t *pi_optional )
+struct vlc_meta_t
{
- (void)p_playlist;
- *pi_mandatory = VLC_META_ENGINE_TITLE | VLC_META_ENGINE_ARTIST;
-
- uint32_t i_meta = input_CurrentMetaFlags( p_item->p_meta );
- *pi_mandatory &= ~i_meta;
- *pi_optional = 0; /// Todo
- return *pi_mandatory ? VLC_FALSE:VLC_TRUE;
-}
+ char * ppsz_meta[VLC_META_TYPE_COUNT];
+
+ vlc_dictionary_t extra_tags;
+
+ int i_status;
+};
-int input_MetaFetch( playlist_t *p_playlist, input_item_t *p_item )
+/* FIXME bad name convention */
+const char * vlc_meta_TypeToLocalizedString( vlc_meta_type_t meta_type )
{
- struct meta_engine_t *p_me;
- uint32_t i_mandatory, i_optional;
-
- input_MetaSatisfied( p_playlist, p_item, &i_mandatory, &i_optional );
- // Meta shouldn't magically appear
- assert( i_mandatory );
-
- /* FIXME: object creation is overkill, use p_private */
- p_me = vlc_object_create( p_playlist, VLC_OBJECT_META_ENGINE );
- p_me->i_flags |= OBJECT_FLAGS_NOINTERACT;
- p_me->i_flags |= OBJECT_FLAGS_QUIET;
- p_me->i_mandatory = i_mandatory;
- p_me->i_optional = i_optional;
-
- p_me->p_item = p_item;
- p_me->p_module = module_Need( p_me, "meta fetcher", 0, VLC_FALSE );
- if( !p_me->p_module )
+ switch( meta_type )
{
- vlc_object_destroy( p_me );
- return VLC_EGENERIC;
+ case vlc_meta_Title: return _("Title");
+ case vlc_meta_Artist: return _("Artist");
+ case vlc_meta_Genre: return _("Genre");
+ case vlc_meta_Copyright: return _("Copyright");
+ case vlc_meta_Album: return _("Album");
+ case vlc_meta_TrackNumber: return _("Track number");
+ case vlc_meta_Description: return _("Description");
+ case vlc_meta_Rating: return _("Rating");
+ case vlc_meta_Date: return _("Date");
+ case vlc_meta_Setting: return _("Setting");
+ case vlc_meta_URL: return _("URL");
+ case vlc_meta_Language: return _("Language");
+ case vlc_meta_NowPlaying: return _("Now Playing");
+ case vlc_meta_Publisher: return _("Publisher");
+ case vlc_meta_EncodedBy: return _("Encoded by");
+ case vlc_meta_ArtworkURL: return _("Artwork URL");
+ case vlc_meta_TrackID: return _("Track ID");
+
+ default: abort();
}
- module_Unneed( p_me, p_me->p_module );
- vlc_object_destroy( p_me );
-
- input_item_SetMetaFetched( p_item, VLC_TRUE );
+};
- return VLC_SUCCESS;
-}
-/* Return codes:
- * 0 : Art is in cache or is a local file
- * 1 : Art found, need to download
- * -X : Error/not found
- */
-int input_ArtFind( playlist_t *p_playlist, input_item_t *p_item )
+/**
+ * vlc_meta contructor.
+ * vlc_meta_Delete() will free the returned pointer.
+ */
+vlc_meta_t *vlc_meta_New( void )
{
- int i_ret = VLC_EGENERIC;
- module_t *p_module;
- char *psz_title, *psz_artist, *psz_album;
-
- psz_artist = input_item_GetArtist( p_item );
- psz_album = input_item_GetAlbum( p_item );
- psz_title = input_item_GetTitle( p_item );
- if(!psz_title)
- psz_title = input_item_GetName( p_item );
-
- if( !psz_title && !psz_artist && !psz_album )
- return VLC_EGENERIC;
-
- free( psz_title );
-
- /* If we already checked this album in this session, skip */
- if( psz_artist && psz_album )
- {
- FOREACH_ARRAY( playlist_album_t album, p_playlist->p_fetcher->albums )
- if( !strcmp( album.psz_artist, psz_artist ) &&
- !strcmp( album.psz_album, psz_album ) )
- {
- msg_Dbg( p_playlist, " %s - %s has already been searched",
- psz_artist, psz_album );
- /* TODO-fenrir if we cache art filename too, we can go faster */
- free( psz_artist );
- free( psz_album );
- if( album.b_found )
- {
- if( !strncmp( album.psz_arturl, "file://", 7 ) )
- input_item_SetArtURL( p_item, album.psz_arturl );
- else /* Actually get URL from cache */
- input_FindArtInCache( p_playlist, p_item );
- return 0;
- }
- else
- {
- return VLC_EGENERIC;
- }
- }
- FOREACH_END();
- }
- free( psz_artist );
- free( psz_album );
-
- input_FindArtInCache( p_playlist, p_item );
-
- char *psz_arturl = input_item_GetArtURL( p_item );
- if( !EMPTY_STR( psz_arturl ) )
- {
- free( psz_arturl );
- return 0; /* Art is in cache, no need to go further */
- }
- free( psz_arturl );
-
- PL_LOCK;
- p_playlist->p_private = p_item;
- psz_album = input_item_GetAlbum( p_item );
- psz_artist = input_item_GetArtist( p_item );
- psz_title = input_item_GetTitle( p_item );
- if( !psz_title )
- psz_title = input_item_GetName( p_item );
-
- if( psz_album && psz_artist )
- {
- msg_Dbg( p_playlist, "searching art for %s - %s",
- psz_artist, psz_album );
- }
- else
- {
- msg_Dbg( p_playlist, "searching art for %s",
- psz_title );
- }
- free( psz_title );
-
- p_module = module_Need( p_playlist, "art finder", 0, VLC_FALSE );
-
- if( p_module )
- i_ret = 1;
- else
- msg_Dbg( p_playlist, "unable to find art" );
-
- /* Record this album */
- if( psz_artist && psz_album )
- {
- playlist_album_t a;
- a.psz_artist = psz_artist;
- a.psz_album = psz_album;
- a.psz_arturl = input_item_GetArtURL( p_item );
- a.b_found = (i_ret == VLC_EGENERIC ? VLC_FALSE : VLC_TRUE );
- ARRAY_APPEND( p_playlist->p_fetcher->albums, a );
- }
- else
- {
- free( psz_artist );
- free( psz_album );
- }
-
- if( p_module )
- module_Unneed( p_playlist, p_module );
- p_playlist->p_private = NULL;
- PL_UNLOCK;
-
- return i_ret;
+ vlc_meta_t *m = (vlc_meta_t*)malloc( sizeof(*m) );
+ if( !m )
+ return NULL;
+ memset( m->ppsz_meta, 0, sizeof(m->ppsz_meta) );
+ m->i_status = 0;
+ vlc_dictionary_init( &m->extra_tags, 0 );
+ return m;
}
-static void ArtCacheCreateDir( const char *psz_dir )
+/* Free a dictonary key allocated by strdup() in vlc_meta_AddExtra() */
+static void vlc_meta_FreeExtraKey( void *p_data, void *p_obj )
{
- char newdir[strlen( psz_dir ) + 1];
- strcpy( newdir, psz_dir );
- char * psz_newdir = newdir;
- char * psz = psz_newdir;
-
- while( *psz )
- {
- while( *psz && *psz != DIR_SEP_CHAR) psz++;
- if( !*psz ) break;
- *psz = 0;
- if( !EMPTY_STR( psz_newdir ) )
- utf8_mkdir( psz_newdir, 0700 );
- *psz = DIR_SEP_CHAR;
- psz++;
- }
- utf8_mkdir( psz_dir, 0700 );
+ VLC_UNUSED( p_obj );
+ free( p_data );
}
-static char * ArtCacheGetSanitizedFileName( const char *psz )
+void vlc_meta_Delete( vlc_meta_t *m )
{
- char *dup = strdup(psz);
int i;
+ for( i = 0; i < VLC_META_TYPE_COUNT ; i++ )
+ free( m->ppsz_meta[i] );
+ vlc_dictionary_clear( &m->extra_tags, vlc_meta_FreeExtraKey, NULL );
+ free( m );
+}
- filename_sanitize( dup );
+/**
+ * vlc_meta has two kinds of meta, the one in a table, and the one in a
+ * dictionary.
+ * FIXME - Why don't we merge those two?
+ */
- /* Doesn't create a filename with invalid characters
- * TODO: several filesystems forbid several characters: list them all
- */
- for( i = 0; dup[i] != '\0'; i++ )
- {
- if( dup[i] == DIR_SEP_CHAR )
- dup[i] = ' ';
- }
- return dup;
+void vlc_meta_Set( vlc_meta_t *p_meta, vlc_meta_type_t meta_type, const char *psz_val )
+{
+ free( p_meta->ppsz_meta[meta_type] );
+ p_meta->ppsz_meta[meta_type] = psz_val ? strdup( psz_val ) : NULL;
}
-#define ArtCacheGetDirPath(a,b,c,d,e) __ArtCacheGetDirPath(VLC_OBJECT(a),b,c,d,e)
-static void __ArtCacheGetDirPath( vlc_object_t *p_obj,
- char *psz_dir,
- const char *psz_title,
- const char *psz_artist, const char *psz_album )
+const char *vlc_meta_Get( const vlc_meta_t *p_meta, vlc_meta_type_t meta_type )
{
- if( !EMPTY_STR(psz_artist) && !EMPTY_STR(psz_album) )
- {
- char * psz_album_sanitized = ArtCacheGetSanitizedFileName( psz_album );
- char * psz_artist_sanitized = ArtCacheGetSanitizedFileName( psz_artist );
-
- snprintf( psz_dir, PATH_MAX, "%s" DIR_SEP
- "art" DIR_SEP "artistalbum" DIR_SEP "%s" DIR_SEP "%s",
- p_obj->p_libvlc->psz_cachedir,
- psz_artist_sanitized, psz_album_sanitized );
- free( psz_album_sanitized );
- free( psz_artist_sanitized );
- }
- else
- {
- char * psz_title_sanitized = ArtCacheGetSanitizedFileName( psz_title );
- snprintf( psz_dir, PATH_MAX, "%s" DIR_SEP
- "art" DIR_SEP "title" DIR_SEP "%s",
- p_obj->p_libvlc->psz_cachedir,
- psz_title_sanitized );
- free( psz_title_sanitized );
- }
+ return p_meta->ppsz_meta[meta_type];
}
-
-
-#define ArtCacheGetFilePath(a,b,c,d,e,f) __ArtCacheGetFilePath(VLC_OBJECT(a),b,c,d,e,f)
-static void __ArtCacheGetFilePath( vlc_object_t *p_obj,
- char * psz_filename,
- const char *psz_title,
- const char *psz_artist, const char *psz_album,
- const char *psz_extension )
+void vlc_meta_AddExtra( vlc_meta_t *m, const char *psz_name, const char *psz_value )
{
- char psz_dir[PATH_MAX+1];
- char * psz_ext;
- ArtCacheGetDirPath( p_obj, psz_dir, psz_title, psz_artist, psz_album );
-
- if( psz_extension )
- {
- psz_ext = strndup( psz_extension, 6 );
- filename_sanitize( psz_ext );
- }
- else psz_ext = strdup( "" );
-
- snprintf( psz_filename, PATH_MAX, "file://%s" DIR_SEP "art%s",
- psz_dir, psz_ext );
-
- free( psz_ext );
+ char *psz_oldvalue = (char *)vlc_dictionary_value_for_key( &m->extra_tags, psz_name );
+ if( psz_oldvalue != kVLCDictionaryNotFound )
+ vlc_dictionary_remove_value_for_key( &m->extra_tags, psz_name,
+ vlc_meta_FreeExtraKey, NULL );
+ vlc_dictionary_insert( &m->extra_tags, psz_name, strdup(psz_value) );
}
-static int __input_FindArtInCache( vlc_object_t *p_obj, input_item_t *p_item )
+const char * vlc_meta_GetExtra( const vlc_meta_t *m, const char *psz_name )
{
- char *psz_artist;
- char *psz_album;
- char *psz_title;
- char psz_dirpath[PATH_MAX+1];
- char psz_filepath[PATH_MAX+1];
- char * psz_filename;
- DIR * p_dir;
-
- psz_artist = input_item_GetArtist( p_item );
- psz_album = input_item_GetAlbum( p_item );
- psz_title = input_item_GetTitle( p_item );
- if( !psz_title ) psz_title = input_item_GetName( p_item );
-
- if( !psz_title && ( !psz_album || !psz_artist ) )
- {
- free( psz_artist );
- free( psz_album );
- free( psz_title );
- return VLC_EGENERIC;
- }
-
- ArtCacheGetDirPath( p_obj, psz_dirpath, psz_title,
- psz_artist, psz_album );
-
- free( psz_artist );
- free( psz_album );
- free( psz_title );
-
- /* Check if file exists */
- p_dir = utf8_opendir( psz_dirpath );
- if( !p_dir )
- return VLC_EGENERIC;
+ return (char *)vlc_dictionary_value_for_key(&m->extra_tags, psz_name);
+}
- while( (psz_filename = utf8_readdir( p_dir )) )
- {
- if( !strncmp( psz_filename, "art", 3 ) )
- {
- snprintf( psz_filepath, PATH_MAX, "file://%s" DIR_SEP "%s",
- psz_dirpath, psz_filename );
- input_item_SetArtURL( p_item, psz_filepath );
- free( psz_filename );
- closedir( p_dir );
- return VLC_SUCCESS;
- }
- free( psz_filename );
- }
+unsigned vlc_meta_GetExtraCount( const vlc_meta_t *m )
+{
+ return vlc_dictionary_keys_count(&m->extra_tags);
+}
- /* Not found */
- closedir( p_dir );
- return VLC_EGENERIC;
+char** vlc_meta_CopyExtraNames( const vlc_meta_t *m )
+{
+ return vlc_dictionary_all_keys(&m->extra_tags);
}
/**
- * Download the art using the URL or an art downloaded
- * This function should be called only if data is not already in cache
+ * vlc_meta status (see vlc_meta_status_e)
*/
-int input_DownloadAndCacheArt( playlist_t *p_playlist, input_item_t *p_item )
+int vlc_meta_GetStatus( vlc_meta_t *m )
{
- int i_status = VLC_EGENERIC;
- stream_t *p_stream;
- char psz_filename[PATH_MAX+1];
- char *psz_artist = NULL;
- char *psz_album = NULL;
- char *psz_title = NULL;
- char *psz_arturl;
- char *psz_type;
-
- psz_artist = input_item_GetArtist( p_item );
- psz_album = input_item_GetAlbum( p_item );
- psz_title = input_item_GetTitle( p_item );
- if( !psz_title )
- psz_title = input_item_GetName( p_item );
-
- if( !psz_title && (!psz_artist || !psz_album) )
- {
- free( psz_title );
- free( psz_album );
- free( psz_artist );
- return VLC_EGENERIC;
- }
-
- psz_arturl = input_item_GetArtURL( p_item );
- assert( !EMPTY_STR( psz_arturl ) );
-
- if( !strncmp( psz_arturl , "file://", 7 ) )
- {
- msg_Dbg( p_playlist, "Album art is local file, no need to cache" );
- free( psz_arturl );
- return VLC_SUCCESS;
- }
- else if( !strncmp( psz_arturl , "APIC", 4 ) )
- {
- msg_Warn( p_playlist, "APIC fetch not supported yet" );
- free( psz_arturl );
- return VLC_EGENERIC;
- }
-
- psz_type = strrchr( psz_arturl, '.' );
- if( strlen( psz_type ) > 5 )
- psz_type = NULL; /* remove extension if it's > to 4 characters */
-
- /* Warning: psz_title, psz_artist, psz_album may change in ArtCache*() */
+ return m->i_status;
+}
- ArtCacheGetDirPath( p_playlist, psz_filename, psz_title, psz_artist,
- psz_album );
- ArtCacheCreateDir( psz_filename );
- ArtCacheGetFilePath( p_playlist, psz_filename, psz_title, psz_artist,
- psz_album, psz_type );
+void vlc_meta_SetStatus( vlc_meta_t *m, int status )
+{
+ m->i_status = status;
+}
- free( psz_artist );
- free( psz_album );
- free( psz_title );
- p_stream = stream_UrlNew( p_playlist, psz_arturl );
- if( p_stream )
+/**
+ * Merging meta
+ */
+void vlc_meta_Merge( vlc_meta_t *dst, const vlc_meta_t *src )
+{
+ char **ppsz_all_keys;
+ int i;
+
+ if( !dst || !src )
+ return;
+
+ for( i = 0; i < VLC_META_TYPE_COUNT; i++ )
{
- uint8_t p_buffer[65536];
- long int l_read;
- FILE *p_file = utf8_fopen( psz_filename+7, "w" );
- if( p_file == NULL ) {
- msg_Err( p_playlist, "Unable write album art in %s",
- psz_filename + 7 );
- free( psz_arturl );
- return VLC_EGENERIC;
- }
- int err = 0;
- while( ( l_read = stream_Read( p_stream, p_buffer, sizeof (p_buffer) ) ) )
- {
- if( fwrite( p_buffer, l_read, 1, p_file ) != 1 )
- {
- err = errno;
- break;
- }
- }
- if( fclose( p_file ) && !err )
- err = errno;
- stream_Delete( p_stream );
-
- if( err )
+ if( src->ppsz_meta[i] )
{
- errno = err;
- msg_Err( p_playlist, "%s: %m", psz_filename );
+ free( dst->ppsz_meta[i] );
+ dst->ppsz_meta[i] = strdup( src->ppsz_meta[i] );
}
- else
- msg_Dbg( p_playlist, "album art saved to %s\n", psz_filename );
-
- input_item_SetArtURL( p_item, psz_filename );
- i_status = VLC_SUCCESS;
}
- free( psz_arturl );
- return i_status;
+
+ /* XXX: If speed up are needed, it is possible */
+ ppsz_all_keys = vlc_dictionary_all_keys( &src->extra_tags );
+ for( i = 0; ppsz_all_keys && ppsz_all_keys[i]; i++ )
+ {
+ /* Always try to remove the previous value */
+ vlc_dictionary_remove_value_for_key( &dst->extra_tags, ppsz_all_keys[i], vlc_meta_FreeExtraKey, NULL );
+
+ void *p_value = vlc_dictionary_value_for_key( &src->extra_tags, ppsz_all_keys[i] );
+ vlc_dictionary_insert( &dst->extra_tags, ppsz_all_keys[i], strdup( (const char*)p_value ) );
+ free( ppsz_all_keys[i] );
+ }
+ free( ppsz_all_keys );
}
+
void input_ExtractAttachmentAndCacheArt( input_thread_t *p_input )
{
- input_item_t *p_item = p_input->p->input.p_item;
- char *psz_arturl;
- char *psz_artist = NULL;
- char *psz_album = NULL;
- char *psz_title = NULL;
- char *psz_type = NULL;
- char psz_filename[PATH_MAX+1];
- FILE *f;
- input_attachment_t *p_attachment;
- struct stat s;
- int i_idx;
-
- /* TODO-fenrir merge input_ArtFind with download and make it set the flags FETCH
- * and then set it here to to be faster */
-
- psz_arturl = input_item_GetArtURL( p_item );
+ input_item_t *p_item = p_input->p->p_item;
+
+ /* */
+ char *psz_arturl = input_item_GetArtURL( p_item );
if( !psz_arturl || strncmp( psz_arturl, "attachment://", strlen("attachment://") ) )
{
- free( psz_arturl );
msg_Err( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
+ free( psz_arturl );
return;
}
- input_item_SetArtURL( p_item, NULL );
+
+ playlist_t *p_playlist = pl_Get( p_input );
if( input_item_IsArtFetched( p_item ) )
{
/* XXX Weird, we should not have end up with attachment:// art url unless there is a race
* condition */
msg_Warn( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
- input_FindArtInCache( p_input, p_item );
- free( psz_arturl );
- return;
+ playlist_FindArtInCache( p_item );
+ goto exit;
}
/* */
- for( i_idx = 0, p_attachment = NULL; i_idx < p_input->p->i_attachment; i_idx++ )
+ input_attachment_t *p_attachment = NULL;
+
+ vlc_mutex_lock( &p_item->lock );
+ for( int i_idx = 0; i_idx < p_input->p->i_attachment; i_idx++ )
{
if( !strcmp( p_input->p->attachment[i_idx]->psz_name,
&psz_arturl[strlen("attachment://")] ) )
{
- p_attachment = p_input->p->attachment[i_idx];
+ p_attachment = vlc_input_attachment_Duplicate( p_input->p->attachment[i_idx] );
break;
}
}
+ vlc_mutex_unlock( &p_item->lock );
+
if( !p_attachment || p_attachment->i_data <= 0 )
{
+ if( p_attachment )
+ vlc_input_attachment_Delete( p_attachment );
msg_Warn( p_input, "internal input error with input_ExtractAttachmentAndCacheArt" );
- goto end;
+ goto exit;
}
- psz_artist = input_item_GetArtist( p_item );
- psz_album = input_item_GetAlbum( p_item );
- psz_title = input_item_GetTitle( p_item );
- if( !psz_title )
- psz_title = input_item_GetName( p_item );
-
- if( (!psz_artist || !psz_album ) && !psz_title )
- goto end;
-
/* */
- psz_type = strrchr( psz_arturl, '.' );
+ const char *psz_type = NULL;
+ if( !strcmp( p_attachment->psz_mime, "image/jpeg" ) )
+ psz_type = ".jpg";
+ else if( !strcmp( p_attachment->psz_mime, "image/png" ) )
+ psz_type = ".png";
- ArtCacheGetDirPath( p_input, psz_filename, psz_title, psz_artist, psz_album );
- ArtCacheCreateDir( psz_filename );
- ArtCacheGetFilePath( p_input, psz_filename, psz_title, psz_artist, psz_album, psz_type );
+ /* */
+ playlist_SaveArt( p_playlist, p_item,
+ p_attachment->p_data, p_attachment->i_data, psz_type );
- /* Check if we already dumped it */
- if( !utf8_stat( psz_filename+7, &s ) )
- goto end;
+ vlc_input_attachment_Delete( p_attachment );
- f = utf8_fopen( psz_filename+7, "w" );
- if( f )
- {
- if( fwrite( p_attachment->p_data, p_attachment->i_data, 1, f ) != 1 )
- msg_Err( p_input, "%s: %m", psz_filename );
- else
- msg_Dbg( p_input, "album art saved to %s\n", psz_filename );
- fclose( f );
- }
-
-end:
- if( psz_artist ) free( psz_artist );
- if( psz_album ) free( psz_album );
- if( psz_title ) free( psz_title );
- if( psz_arturl ) free( psz_arturl );
+exit:
+ free( psz_arturl );
}
-
-uint32_t input_CurrentMetaFlags( vlc_meta_t *p_meta )
+int input_item_WriteMeta( vlc_object_t *obj, input_item_t *p_item )
{
- uint32_t i_meta = 0;
-
- if( !p_meta )
- return 0;
-
-#define CHECK( a, b ) \
- if( !EMPTY_STR( vlc_meta_Get( p_meta, vlc_meta_ ## a ) ) ) \
- i_meta |= VLC_META_ENGINE_ ## b;
-
- CHECK( Title, TITLE )
- CHECK( Artist, ARTIST )
- CHECK( Album, COLLECTION )
-#if 0
- /* As this is not used at the moment, don't uselessly check for it.
- * Re-enable this when it is used */
- CHECK( Genre, GENRE )
- CHECK( Copyright, COPYRIGHT )
- CHECK( Tracknum, SEQ_NUM )
- CHECK( Description, DESCRIPTION )
- CHECK( Rating, RATING )
- CHECK( Date, DATE )
- CHECK( URL, URL )
- CHECK( Language, LANGUAGE )
-#endif
- CHECK( ArtworkURL, ART_URL )
+ meta_export_t *p_export =
+ vlc_custom_create( obj, sizeof( *p_export ), VLC_OBJECT_GENERIC,
+ "meta writer" );
+ if( p_export == NULL )
+ return VLC_ENOMEM;
+ vlc_object_attach( p_export, obj );
+ p_export->p_item = p_item;
+
+ int type;
+ vlc_mutex_lock( &p_item->lock );
+ type = p_item->i_type;
+ vlc_mutex_unlock( &p_item->lock );
+ if( type != ITEM_TYPE_FILE )
+ goto error;
+
+ char *psz_uri = input_item_GetURI( p_item );
+ p_export->psz_file = make_path( psz_uri );
+ if( p_export->psz_file == NULL )
+ msg_Err( p_export, "cannot write meta to remote media %s", psz_uri );
+ free( psz_uri );
+ if( p_export->psz_file == NULL )
+ goto error;
+
+ module_t *p_mod = module_need( p_export, "meta writer", NULL, false );
+ if( p_mod )
+ module_unneed( p_export, p_mod );
+ vlc_object_release( p_export );
+ return VLC_SUCCESS;
- return i_meta;
+error:
+ vlc_object_release( p_export );
+ return VLC_EGENERIC;
}
projects / vlc / blobdiff