1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-04-22 00:42:04 +02:00

Remove Phonon traces

This commit is contained in:
Uwe L. Korn 2014-10-21 20:46:44 +02:00
parent 68f608ac1a
commit a17a0e154c
4 changed files with 1 additions and 44 deletions

@ -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.)

@ -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 <kretz@kde.org>
#
# 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 )

@ -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}

@ -1,11 +1,3 @@
/*
#include <phonon/MediaObject>
#include <phonon/AudioOutput>
#include <phonon/Path>
#include <phonon/BackendCapabilities>
#include <phonon/Effect>
#include <phonon/EffectParameter>
*/
#include "AudioOutput.h"
#include <stdint.h>