From a17a0e154c4a7a1a3421e82df32bd655b91e9724 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Tue, 21 Oct 2014 20:46:44 +0200 Subject: [PATCH] Remove Phonon traces --- CMakeLists.txt | 11 +---------- CMakeModules/FindPhonon.cmake | 24 ------------------------ src/libtomahawk/CMakeLists.txt | 2 -- src/libtomahawk/audio/AudioEngine_p.h | 8 -------- 4 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 CMakeModules/FindPhonon.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 99f3111d2..68da1ba3b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -380,16 +380,7 @@ if (WITH_KDE4) endif(WITH_KDE4) macro_log_feature(KDE4_FOUND "KDE4" "Provides support for configuring Telepathy Accounts from inside Tomahawk" "https://www.kde.org" FALSE "" "") -# if(NOT Phonon_FOUND) -# macro_optional_find_package(Phonon 4.5.0) -# endif() -# macro_log_feature(Phonon_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "") - -# if(Phonon_FOUND) -# message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4") -# endif() -# -IF( KDE4_FOUND OR Phonon_FOUND ) +IF( KDE4_FOUND ) IF( CMAKE_C_FLAGS ) # KDE4 adds and removes some compiler flags that we don't like # (only for gcc not for clang e.g.) diff --git a/CMakeModules/FindPhonon.cmake b/CMakeModules/FindPhonon.cmake deleted file mode 100644 index ff7fd8e49..000000000 --- a/CMakeModules/FindPhonon.cmake +++ /dev/null @@ -1,24 +0,0 @@ -# Find libphonon -# Once done this will define -# -# PHONON_FOUND - system has Phonon Library -# PHONON_INCLUDES - the Phonon include directory -# PHONON_LIBS - link these to use Phonon -# PHONON_VERSION - the version of the Phonon Library - -# Copyright (c) 2008, Matthias Kretz -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -include(FindPackageHandleStandardArgs) - -if( TOMAHAWK_QT5 ) - find_package(Phonon4Qt5 NO_MODULE) - set(Phonon_FOUND ${Phonon4Qt5_FOUND}) - set(Phonon_DIR ${Phonon4Qt5_DIR}) -else() - find_package(Phonon NO_MODULE) -endif() - -find_package_handle_standard_args(Phonon DEFAULT_MSG Phonon_DIR ) diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt index 33079a431..0459c62ba 100644 --- a/src/libtomahawk/CMakeLists.txt +++ b/src/libtomahawk/CMakeLists.txt @@ -391,7 +391,6 @@ include_directories( ${QJSON_INCLUDE_DIR} ${ECHONEST_INCLUDE_DIR} ${LUCENEPP_INCLUDE_DIRS} - ${PHONON_INCLUDES} ${LIBVLC_INCLUDE_DIR} ${LIBVLCCORE_INCLUDE_DIR} ${Boost_INCLUDE_DIR} @@ -505,7 +504,6 @@ ENDIF( UNIX AND NOT APPLE ) TARGET_LINK_LIBRARIES( tomahawklib LINK_PRIVATE - ${PHONON_LIBRARY} ${LIBVLC_LIBRARY} ${LIBVLCCORE_LIBRARY} diff --git a/src/libtomahawk/audio/AudioEngine_p.h b/src/libtomahawk/audio/AudioEngine_p.h index c2e5edf76..59e90c851 100644 --- a/src/libtomahawk/audio/AudioEngine_p.h +++ b/src/libtomahawk/audio/AudioEngine_p.h @@ -1,11 +1,3 @@ -/* -#include -#include -#include -#include -#include -#include -*/ #include "AudioOutput.h" #include