vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu Feb 7 14:46:48 2019 +0100| [a4f4e40465fec75c02422ac3a9d32713ef98fc2f] | committer: Hugo Beauzée-Luyssen
taglib: Require version 1.11 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a4f4e40465fec75c02422ac3a9d32713ef98fc2f --- configure.ac | 2 +- modules/meta_engine/taglib.cpp | 16 +++------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index fbebecd5c2..c7a9ef0d7d 100644 --- a/configure.ac +++ b/configure.ac @@ -4224,7 +4224,7 @@ AC_ARG_ENABLE([taglib], AS_HELP_STRING([--disable-taglib], [do not use TagLib (default enabled)])) AS_IF([test "${enable_taglib}" != "no"], [ - PKG_CHECK_MODULES(TAGLIB, taglib >= 1.9, [ + PKG_CHECK_MODULES(TAGLIB, taglib >= 1.11, [ VLC_ADD_PLUGIN([taglib]) ], [ AC_MSG_WARN([${TAGLIB_PKG_ERRORS}.])]) diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp index 298a108c8c..bdd44b8f2d 100644 --- a/modules/meta_engine/taglib.cpp +++ b/modules/meta_engine/taglib.cpp @@ -55,17 +55,13 @@ TAGLIB_MINOR_VERSION, \ TAGLIB_PATCH_VERSION) -#define TAGLIB_VERSION_1_11 VERSION_INT(1,11,0) - #include <fileref.h> #include <tag.h> #include <tbytevector.h> /* Support for stream-based metadata */ -#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 -# include <vlc_access.h> -# include <tiostream.h> -#endif +#include <vlc_access.h> +#include <tiostream.h> #include <apefile.h> #include <asffile.h> @@ -135,9 +131,7 @@ File *VLCTagLib::ExtResolver<T>::createFile(FileName fileName, bool, AudioProper return 0; } -#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 static VLCTagLib::ExtResolver<MPEG::File> aacresolver(".aac"); -#endif static VLCTagLib::ExtResolver<MP4::File> m4vresolver(".m4v"); static bool b_extensions_registered = false; @@ -156,7 +150,6 @@ vlc_module_begin () set_callbacks( WriteMeta, NULL ) vlc_module_end () -#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 class VlcIostream : public IOStream { public: @@ -254,7 +247,6 @@ private: stream_t* m_stream; int64_t m_previousPos; }; -#endif /* TAGLIB_VERSION_1_11 */ static int ExtractCoupleNumberValues( vlc_meta_t* p_meta, const char *psz_value, vlc_meta_type_t first, vlc_meta_type_t second) @@ -834,7 +826,7 @@ static int ReadMeta( vlc_object_t* p_this) if( unlikely(psz_uri == NULL) ) return VLC_ENOMEM; -#if VLC_WINSTORE_APP && TAGLIB_VERSION >= TAGLIB_VERSION_1_11 +#if VLC_WINSTORE_APP stream_t *p_stream = vlc_access_NewMRL( p_this, psz_uri ); free( psz_uri ); if( p_stream == NULL ) @@ -850,9 +842,7 @@ static int ReadMeta( vlc_object_t* p_this) if( !b_extensions_registered ) { -#if TAGLIB_VERSION >= TAGLIB_VERSION_1_11 FileRef::addFileTypeResolver( &aacresolver ); -#endif FileRef::addFileTypeResolver( &m4vresolver ); b_extensions_registered = true; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
