#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_playlist.h>
#include <vlc_meta.h>
#include <vlc_demux.h>
#include <vlc_strings.h>
#include <vlc_charset.h>
#include <vlc_url.h>
+#include <vlc_input_item.h>
+#include <vlc_input.h> /* for attachment_new */
#ifdef WIN32
# include <io.h>
#include <mpegfile.h>
#include <oggfile.h>
#include <oggflacfile.h>
+
+#ifdef TAGLIB_WITH_ASF
+# include <aifffile.h>
+# include <wavfile.h>
+#endif
+
+#ifdef TAGLIB_WITH_MP4
+# include <mp4file.h>
+#endif
+
#include <speexfile.h>
#include <trueaudiofile.h>
#include <vorbisfile.h>
/**
- * Read meta informations from APE tags
+ * Read meta information from APE tags
* @param tag: the APE tag
* @param p_demux; the demux object
* @param p_demux_meta: the demuxer meta
{
ID3v2::UniqueFileIdentifierFrame* p_ufid =
dynamic_cast<ID3v2::UniqueFileIdentifierFrame*>(*iter);
+ if( !p_ufid )
+ continue;
const char *owner = p_ufid->owner().toCString();
if (!strcmp( owner, "http://musicbrainz.org" ))
{
{
ID3v2::UserTextIdentificationFrame* p_txxx =
dynamic_cast<ID3v2::UserTextIdentificationFrame*>(*iter);
+ if( !p_txxx )
+ continue;
vlc_meta_AddExtra( p_meta, p_txxx->description().toCString( true ),
p_txxx->fieldList().toString().toCString( true ) );
}
- // Get some more informations
+ // Get some more information
#define SET( tagName, metaName ) \
list = tag->frameListMap()[tagName]; \
if( !list.isEmpty() ) \
3, /* Logo of the band or performer. */
2 /* Logo of the publisher (record company). */
};
+ #define PI_COVER_SCORE_SIZE (sizeof (pi_cover_score) / sizeof (pi_cover_score[0]))
int i_score = -1;
// Try now to get embedded art
{
ID3v2::AttachedPictureFrame* p_apic =
dynamic_cast<ID3v2::AttachedPictureFrame*>(*iter);
+ if( !p_apic )
+ continue;
input_attachment_t *p_attachment;
const char *psz_mime;
p_attachment );
free( psz_description );
- if( pi_cover_score[p_apic->type()] > i_score )
+ unsigned i_pic_type = p_apic->type();
+ if( i_pic_type >= PI_COVER_SCORE_SIZE )
+ i_pic_type = 0; // Defaults to "Other"
+
+ if( pi_cover_score[i_pic_type] > i_score )
{
- i_score = pi_cover_score[p_apic->type()];
+ i_score = pi_cover_score[i_pic_type];
char *psz_url;
if( asprintf( &psz_url, "attachment://%s",
p_attachment->psz_name ) == -1 )
/**
- * Read the meta informations from XiphComments
+ * Read the meta information from XiphComments
* @param tag: the Xiph Comment
* @param p_demux; the demux object
* @param p_demux_meta: the demuxer meta
vlc_meta_SetArtURL( p_meta, "attachment://cover" );
}
-
+#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H)
+static void ReadMetaFromMP4( MP4::Tag* tag, demux_t *p_demux, demux_meta_t *p_demux_meta, vlc_meta_t* p_meta )
+{
+ if( tag->itemListMap().contains("covr") )
+ {
+ MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
+ const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
+
+ msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
+ psz_format, list[0].data().size() );
+
+ TAB_INIT( p_demux_meta->i_attachments, p_demux_meta->attachments );
+ input_attachment_t *p_attachment =
+ vlc_input_attachment_New( "cover", psz_format, "cover",
+ list[0].data().data(), list[0].data().size() );
+ TAB_APPEND_CAST( (input_attachment_t**),
+ p_demux_meta->i_attachments, p_demux_meta->attachments,
+ p_attachment );
+ vlc_meta_SetArtURL( p_meta, "attachment://cover" );
+ }
+}
+#endif
/**
* Get the tags from the file using TagLib
FileRef f;
p_demux_meta->p_meta = NULL;
+ if( strcmp( p_demux->psz_access, "file" ) )
+ return VLC_EGENERIC;
+ char *psz_path = strdup( p_demux->psz_file );
+ if( !psz_path )
+ return VLC_ENOMEM;
#if defined(WIN32) || defined (UNDER_CE)
wchar_t wpath[MAX_PATH + 1];
- if( !MultiByteToWideChar( CP_UTF8, 0, p_demux->psz_path, -1, wpath, MAX_PATH) )
+ if( !MultiByteToWideChar( CP_UTF8, 0, psz_path, -1, wpath, MAX_PATH) )
+ {
+ free( psz_path );
return VLC_EGENERIC;
+ }
wpath[MAX_PATH] = L'\0';
f = FileRef( wpath );
#else
- const char* local_name = ToLocale( p_demux->psz_path );
+ const char* local_name = ToLocale( psz_path );
if( !local_name )
+ {
+ free( psz_path );
return VLC_EGENERIC;
+ }
f = FileRef( local_name );
LocaleFree( local_name );
#endif
+ free( psz_path );
if( f.isNull() )
return VLC_EGENERIC;
else if( flac->xiphComment() )
ReadMetaFromXiph( flac->xiphComment(), p_demux, p_demux_meta, p_meta );
}
+#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H)
+ else if( MP4::File *mp4 = dynamic_cast<MP4::File*>(f.file()) )
+ {
+ if( mp4->tag() )
+ ReadMetaFromMP4( mp4->tag(), p_demux, p_demux_meta, p_meta );
+ }
+#endif
else if( MPC::File* mpc = dynamic_cast<MPC::File*>(f.file()) )
{
if( mpc->APETag() )
else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
ReadMetaFromXiph( ogg_vorbis->tag(), p_demux, p_demux_meta, p_meta );
}
+#ifdef TAGLIB_WITH_ASF
+ else if( RIFF::File* riff = dynamic_cast<RIFF::File*>(f.file()) )
+ {
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ ReadMetaFromId3v2( riff_aiff->tag(), p_demux, p_demux_meta, p_meta );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+ ReadMetaFromId3v2( riff_wav->tag(), p_demux, p_demux_meta, p_meta );
+ }
+#endif
else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
{
if( trueaudio->ID3v2Tag() )
/**
- * Write meta informations to APE tags
+ * Write meta information to APE tags
* @param tag: the APE tag
* @param p_item: the input item
*/
/**
- * Write the meta informations to XiphComments
+ * Write the meta information to XiphComments
* @param tag: the Xiph Comment
* @param p_input: the input item
*/
static int WriteMeta( vlc_object_t *p_this )
{
- playlist_t *p_playlist = (playlist_t *)p_this;
- meta_export_t *p_export = (meta_export_t *)p_playlist->p_private;
+ meta_export_t *p_export = (meta_export_t *)p_this;
input_item_t *p_item = p_export->p_item;
FileRef f;
return VLC_EGENERIC;
}
- char *export_file = strdup(p_export->psz_file);
- if( decode_URI( export_file ) == NULL )
- {
- free( export_file );
- return VLC_EGENERIC;
- }
-
#if defined(WIN32) || defined (UNDER_CE)
wchar_t wpath[MAX_PATH + 1];
- if( !MultiByteToWideChar( CP_UTF8, 0, export_file , -1, wpath, MAX_PATH) )
+ if( !MultiByteToWideChar( CP_UTF8, 0, p_export->psz_file, -1, wpath, MAX_PATH) )
return VLC_EGENERIC;
wpath[MAX_PATH] = L'\0';
f = FileRef( wpath );
#else
- const char* local_name = ToLocale( export_file );
+ const char* local_name = ToLocale( p_export->psz_file );
if( !local_name )
- {
- free( export_file );
return VLC_EGENERIC;
- }
f = FileRef( local_name );
LocaleFree( local_name );
#endif
if( f.isNull() || !f.tag() || f.file()->readOnly() )
{
msg_Err( p_this, "File %s can't be opened for tag writing",
- export_file );
- free( export_file );
+ p_export->psz_file );
return VLC_EGENERIC;
}
- msg_Dbg( p_this, "Writing metadata for %s", export_file );
- free( export_file );
+ msg_Dbg( p_this, "Writing metadata for %s", p_export->psz_file );
Tag *p_tag = f.tag();
char *psz_meta;
-#define SET( a, b ) \
- if( b ) \
- { \
- String* psz_tmp = new String( b, String::UTF8 ); \
- p_tag->set##a( *psz_tmp ); \
- delete psz_tmp; \
- }
+#define SET( a, b ) \
+ psz_meta = input_item_Get ## a( p_item ); \
+ if( psz_meta ) \
+ { \
+ String tmp( psz_meta, String::UTF8 ); \
+ p_tag->set##b( tmp ); \
+ } \
+ free( psz_meta );
// Saving all common fields
// If the title is empty, use the name
- psz_meta = input_item_GetTitleFbName( p_item );
- SET( Title, psz_meta );
- free( psz_meta );
-
- psz_meta = input_item_GetArtist( p_item );
- SET( Artist, psz_meta );
- free( psz_meta );
-
- psz_meta = input_item_GetAlbum( p_item );
- SET( Album, psz_meta );
- free( psz_meta );
-
- psz_meta = input_item_GetDescription( p_item );
- SET( Comment, psz_meta );
- free( psz_meta );
-
- psz_meta = input_item_GetGenre( p_item );
- SET( Genre, psz_meta );
- free( psz_meta );
+ SET( TitleFbName, Title );
+ SET( Artist, Artist );
+ SET( Album, Album );
+ SET( Description, Comment );
+ SET( Genre, Genre );
#undef SET
else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
WriteMetaToXiph( ogg_vorbis->tag(), p_item );
}
+#ifdef TAGLIB_WITH_ASF
+ else if( RIFF::File* riff = dynamic_cast<RIFF::File*>(f.file()) )
+ {
+ if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
+ WriteMetaToId3v2( riff_aiff->tag(), p_item );
+ else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
+ WriteMetaToId3v2( riff_wav->tag(), p_item );
+ }
+#endif
else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
{
if( trueaudio->ID3v2Tag() )
projects / vlc / blobdiff