#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 <wavfile.h>
#endif
+#ifdef TAGLIB_WITH_MP4
+# include <mp4file.h>
+#endif
+
#include <speexfile.h>
#include <trueaudiofile.h>
#include <vorbisfile.h>
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() )
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();