[vlc-commits] taglib: ASF cover art support comes only after v1. 7 and if TAGLIB_WITH_ASF is defined.

[Rémi Duraffort]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sun Jun  5 00:08:09 2011 +0200| [449b78e85a7867e38dc1fafe1b10f8339faea418] | committer: Rémi Duraffort

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=449b78e85a7867e38dc1fafe1b10f8339faea418
---

 modules/meta_engine/taglib.cpp |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index d0bb4ce..e9dadb0 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -62,12 +62,12 @@
 #if TAGLIB_VERSION >= VERSION_INT(1,7,0)
 # define TAGLIB_HAVE_APEFILE_H
 # include <apefile.h>
-#endif
-
-#ifdef TAGLIB_WITH_ASF
-# include <asffile.h>
-# include <asftag.h>
-# include <asfattribute.h>
+# ifdef TAGLIB_WITH_ASF                     // ASF pictures comes with v1.7.0
+#  define TAGLIB_HAVE_ASFPICTURE_H
+#  include <asffile.h>
+#  include <asftag.h>
+#  include <asfattribute.h>
+# endif
 #endif
 
 #include <flacfile.h>
@@ -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
  * @param tag: the APE tag
@@ -516,7 +516,7 @@ static int ReadMeta( vlc_object_t* p_this)
     }
     else
 #endif
-#ifdef TAGLIB_WITH_ASF
+#ifdef TAGLIB_HAVE_ASFPICTURE_H
     if( ASF::File* asf = dynamic_cast<ASF::File*>(f.file()) )
     {
         if( asf->tag() )