Commit 449b78e8 authored by Rémi Duraffort's avatar Rémi Duraffort

taglib: ASF cover art support comes only after v1.7 and if TAGLIB_WITH_ASF is defined.

parent b38b9c24
...@@ -62,12 +62,12 @@ ...@@ -62,12 +62,12 @@
#if TAGLIB_VERSION >= VERSION_INT(1,7,0) #if TAGLIB_VERSION >= VERSION_INT(1,7,0)
# define TAGLIB_HAVE_APEFILE_H # define TAGLIB_HAVE_APEFILE_H
# include <apefile.h> # include <apefile.h>
#endif # ifdef TAGLIB_WITH_ASF // ASF pictures comes with v1.7.0
# define TAGLIB_HAVE_ASFPICTURE_H
#ifdef TAGLIB_WITH_ASF
# include <asffile.h> # include <asffile.h>
# include <asftag.h> # include <asftag.h>
# include <asfattribute.h> # include <asfattribute.h>
# endif
#endif #endif
#include <flacfile.h> #include <flacfile.h>
...@@ -134,7 +134,7 @@ static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t*, vlc_meta_t* p_meta ) ...@@ -134,7 +134,7 @@ static void ReadMetaFromAPE( APE::Tag* tag, demux_meta_t*, vlc_meta_t* p_meta )
} }
#ifdef TAGLIB_WITH_ASF #ifdef TAGLIB_HAVE_ASFPICTURE_H
/** /**
* Read meta information from APE tags * Read meta information from APE tags
* @param tag: the APE tag * @param tag: the APE tag
...@@ -516,7 +516,7 @@ static int ReadMeta( vlc_object_t* p_this) ...@@ -516,7 +516,7 @@ static int ReadMeta( vlc_object_t* p_this)
} }
else else
#endif #endif
#ifdef TAGLIB_WITH_ASF #ifdef TAGLIB_HAVE_ASFPICTURE_H
if( ASF::File* asf = dynamic_cast<ASF::File*>(f.file()) ) if( ASF::File* asf = dynamic_cast<ASF::File*>(f.file()) )
{ {
if( asf->tag() ) if( asf->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