#include <vlc_common.h>
#include <vlc_plugin.h>
-#include <vlc_meta.h>
-#include <vlc_demux.h>
-#include <vlc_strings.h>
-#include <vlc_charset.h>
-#include <vlc_input.h> /* for attachment_new */
+#include <vlc_demux.h> /* demux_meta_t */
+#include <vlc_strings.h> /* vlc_b64_decode_binary */
+#include <vlc_charset.h> /* ToLocale, LocaleFree */
+#include <vlc_input.h> /* for attachment_new */
#ifdef WIN32
# include <io.h>
# define TAGLIB_HAVE_AIFF_WAV_H
# include <aifffile.h>
# include <wavfile.h>
+#else
+# include <id3v2tag.h>
#endif
#if TAGLIB_VERSION >= VERSION_INT(1,6,1) && defined(TAGLIB_WITH_MP4)
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) )
+ wchar_t *wpath = ToWide( psz_path );
+ if( wpath == NULL )
{
free( psz_path );
return VLC_EGENERIC;
}
- wpath[MAX_PATH] = L'\0';
f = FileRef( wpath );
+ free( wpath );
#else
const char* local_name = ToLocale( psz_path );
if( !local_name )
}
#if defined(WIN32) || defined (UNDER_CE)
- wchar_t wpath[MAX_PATH + 1];
- if( !MultiByteToWideChar( CP_UTF8, 0, p_export->psz_file, -1, wpath, MAX_PATH) )
+ wchar_t *wpath = ToWide( p_export->psz_file );
+ if( wpath == NULL )
return VLC_EGENERIC;
- wpath[MAX_PATH] = L'\0';
f = FileRef( wpath );
+ free( wpath );
#else
const char* local_name = ToLocale( p_export->psz_file );
if( !local_name )