Commit 3075370f authored by Götz Waschk's avatar Götz Waschk Committed by Rémi Duraffort

Fix taglib compilation.

1.6.0 does not support cover arts but the later version does support it.
Signed-off-by: default avatarRémi Duraffort <ivoire@videolan.org>
(cherry picked from commit d456bb4a)
Signed-off-by: default avatarRémi Duraffort <ivoire@videolan.org>
parent 0dd0055d
...@@ -1713,7 +1713,11 @@ AC_ARG_ENABLE(taglib, ...@@ -1713,7 +1713,11 @@ AC_ARG_ENABLE(taglib,
PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5, PKG_CHECK_MODULES(TAGLIB, taglib >= 1.5,
[ VLC_ADD_PLUGIN([taglib]) [ VLC_ADD_PLUGIN([taglib])
VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz]) VLC_ADD_LIBS([taglib],[$TAGLIB_LIBS -lz])
VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS]) ], VLC_ADD_CXXFLAGS([taglib],[$TAGLIB_CFLAGS])
AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(taglib/mp4coverart.h)
AC_LANG_POP(C++)
],
[AC_MSG_WARN(TagLib library not found)]) [AC_MSG_WARN(TagLib library not found)])
]) ])
......
...@@ -321,7 +321,7 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_met ...@@ -321,7 +321,7 @@ static void ReadMetaFromXiph( Ogg::XiphComment* tag, demux_t* p_demux, demux_met
vlc_meta_SetArtURL( p_meta, "attachment://cover" ); 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 ) 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") ) if( tag->itemListMap().contains("covr") )
...@@ -414,7 +414,7 @@ static int ReadMeta( vlc_object_t* p_this) ...@@ -414,7 +414,7 @@ static int ReadMeta( vlc_object_t* p_this)
else if( flac->xiphComment() ) else if( flac->xiphComment() )
ReadMetaFromXiph( flac->xiphComment(), p_demux, p_demux_meta, p_meta ); 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()) ) else if( MP4::File *mp4 = dynamic_cast<MP4::File*>(f.file()) )
{ {
if( mp4->tag() ) if( mp4->tag() )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment