From 81e9c9eb6401f1ff6cf91ba92dbbee03c52bdf6c Mon Sep 17 00:00:00 2001
From: "Uwe L. Korn" <uwelk@xhochy.com>
Date: Fri, 5 Dec 2014 20:49:19 +0100
Subject: [PATCH] Use version instead of compile check to determine for VLC
 feature detection

---
 CMakeModules/FindLIBVLC.cmake                 | 9 ---------
 src/libtomahawk/filemetadata/MusicScanner.cpp | 3 ++-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/CMakeModules/FindLIBVLC.cmake b/CMakeModules/FindLIBVLC.cmake
index b4f23396e..3e15769dc 100644
--- a/CMakeModules/FindLIBVLC.cmake
+++ b/CMakeModules/FindLIBVLC.cmake
@@ -22,15 +22,6 @@ find_library(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore
 
 set(LIBVLC_VERSION ${PC_LIBVLC_VERSION})
 
-include(CheckCXXSourceCompiles)
-check_cxx_source_compiles("
-#include <vlc/libvlc.h>
-#include <vlc/libvlc_media.h>
-int main(int argc, char *argv[]) {
-    libvlc_meta_t meta = libvlc_meta_AlbumArtist;
-}"
-HAVE_VLC_ALBUMARTIST)
-
 find_package_handle_standard_args(LibVLC
     REQUIRED_VARS LIBVLC_LIBRARY LIBVLCCORE_LIBRARY LIBVLC_INCLUDE_DIR
     VERSION_VAR LIBVLC_VERSION
diff --git a/src/libtomahawk/filemetadata/MusicScanner.cpp b/src/libtomahawk/filemetadata/MusicScanner.cpp
index 2da373dca..3abdc3843 100644
--- a/src/libtomahawk/filemetadata/MusicScanner.cpp
+++ b/src/libtomahawk/filemetadata/MusicScanner.cpp
@@ -37,6 +37,7 @@
 
 #include <vlc/libvlc.h>
 #include <vlc/libvlc_media.h>
+#include <vlc/libvlc_version.h>
 
 using namespace Tomahawk;
 
@@ -420,7 +421,7 @@ MusicScanner::readTags( const QFileInfo& fi, libvlc_instance_t* vlcInstance )
     m["size"]         = (unsigned int)fi.size();
     m["mimetype"]     = mimetype;
 
-#ifdef HAVE_VLC_ALBUMARTIST
+#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0))
     libvlc_media_t* media = libvlc_media_new_path( vlcInstance, fi.canonicalFilePath().toUtf8().constData() );
     libvlc_media_parse( media );