Skip to content

V
vlc-2-2
Commit 599eee10 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

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

parent b4b357ee
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/meta_engine/taglib.cpp
View file @ 599eee10
...@@ -69,7 +69,8 @@ ...@@ -69,7 +69,8 @@
#include <oggfile.h> #include <oggfile.h>
#include <oggflacfile.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 <aifffile.h>
# include <wavfile.h> # include <wavfile.h>
#endif #endif
...@@ -488,7 +489,7 @@ static int ReadMeta( vlc_object_t* p_this) ...@@ -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()) ) else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
ReadMetaFromXiph( ogg_vorbis->tag(), p_demux_meta, p_meta ); 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()) ) else if( dynamic_cast<RIFF::File*>(f.file()) )
{ {
if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::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 ) ...@@ -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()) ) else if( Ogg::Vorbis::File* ogg_vorbis = dynamic_cast<Ogg::Vorbis::File*>(f.file()) )
WriteMetaToXiph( ogg_vorbis->tag(), p_item ); WriteMetaToXiph( ogg_vorbis->tag(), p_item );
} }
#ifdef TAGLIB_WITH_ASF #ifdef TAGLIB_HAVE_RIFF_WAV_H
else if( dynamic_cast<RIFF::File*>(f.file()) ) else if( dynamic_cast<RIFF::File*>(f.file()) )
{ {
if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) ) if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
......
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