#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>
/**
- * 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" );
}
-#ifdef TAGLIB_WITH_MP4
+#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",
demux_t* p_demux = p_demux_meta->p_demux;
vlc_meta_t* p_meta;
FileRef f;
- char *psz_path = decode_URI_duplicate( p_demux->psz_path );
p_demux_meta->p_meta = NULL;
- if( !psz_path )
- return VLC_ENOMEM;
- if( strncmp( p_demux->psz_access, "file", strlen("file") ) )
+ 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, 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( psz_path );
if( !local_name )
+ {
+ free( psz_path );
return VLC_EGENERIC;
+ }
f = FileRef( local_name );
LocaleFree( local_name );
#endif
else if( flac->xiphComment() )
ReadMetaFromXiph( flac->xiphComment(), p_demux, p_demux_meta, p_meta );
}
-#ifdef TAGLIB_WITH_MP4
+#if defined(TAGLIB_WITH_MP4) && defined(HAVE_TAGLIB_MP4COVERART_H)
else if( MP4::File *mp4 = dynamic_cast<MP4::File*>(f.file()) )
{
if( mp4->tag() )
/**
- * 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
*/