[vlc-commits] taglib: RIFF and WAV files are present since v1.6.0

[Rémi Duraffort]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sat Jun  4 12:28:39 2011 +0200| [599eee103d3b6d597b8e5a4f3c9cd86df931e7cf] | committer: Rémi Duraffort

taglib: RIFF and WAV files are present since v1.6.0

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

 modules/meta_engine/taglib.cpp |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index c85efa1..ae6cf2a 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -69,7 +69,8 @@
 #include <oggfile.h>
 #include <oggflacfile.h>
 
-#ifdef TAGLIB_WITH_ASF
+#if TAGLIB_VERSION >= VERSION_INT(1,6,0)
+# define TAGLIB_HAVE_RIFF_WAV_H
 # include <aifffile.h>
 # include <wavfile.h>
 #endif
@@ -488,7 +489,7 @@ static int ReadMeta( vlc_object_t* p_this)
         else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
             ReadMetaFromXiph( ogg_vorbis->tag(), p_demux_meta, p_meta );
     }
-#ifdef TAGLIB_WITH_ASF
+#ifdef TAGLIB_HAVE_RIFF_WAV_H
     else if( dynamic_cast<RIFF::File*>(f.file()) )
     {
         if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
@@ -707,7 +708,7 @@ static int WriteMeta( vlc_object_t *p_this )
         else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
             WriteMetaToXiph( ogg_vorbis->tag(), p_item );
     }
-#ifdef TAGLIB_WITH_ASF
+#ifdef TAGLIB_HAVE_RIFF_WAV_H
     else if( dynamic_cast<RIFF::File*>(f.file()) )
     {
         if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )