mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-19 12:21:52 +02:00
Code Issues Releases Wiki Activity

Use version instead of compile check to determine for VLC feature detection

Browse Source
This commit is contained in:
Uwe L. Korn
2014-12-05 20:49:19 +01:00
parent 8da198eea2
commit 81e9c9eb64
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeModules/FindLIBVLC.cmake
View File

@@ -22,15 +22,6 @@ find_library(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore
set(LIBVLC_VERSION ${PC_LIBVLC_VERSION}) 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 find_package_handle_standard_args(LibVLC
REQUIRED_VARS LIBVLC_LIBRARY LIBVLCCORE_LIBRARY LIBVLC_INCLUDE_DIR REQUIRED_VARS LIBVLC_LIBRARY LIBVLCCORE_LIBRARY LIBVLC_INCLUDE_DIR
VERSION_VAR LIBVLC_VERSION VERSION_VAR LIBVLC_VERSION

3
src/libtomahawk/filemetadata/MusicScanner.cpp
View File

@@ -37,6 +37,7 @@
#include <vlc/libvlc.h> #include <vlc/libvlc.h>
#include <vlc/libvlc_media.h> #include <vlc/libvlc_media.h>
#include <vlc/libvlc_version.h>
using namespace Tomahawk; using namespace Tomahawk;
@@ -420,7 +421,7 @@ MusicScanner::readTags( const QFileInfo& fi, libvlc_instance_t* vlcInstance )
m["size"] = (unsigned int)fi.size(); m["size"] = (unsigned int)fi.size();
m["mimetype"] = mimetype; 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_t* media = libvlc_media_new_path( vlcInstance, fi.canonicalFilePath().toUtf8().constData() );
libvlc_media_parse( media ); libvlc_media_parse( media );