updated cmake scripts

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5989 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 26 insertions, 22 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4b5e7fcc..367a60f2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,6 +175,7 @@ PRINT_SUMMARY ("Qt Multimedia support ............." USE_QTMULTIMEDIA QT_QTMULTI
 MESSAGE("")
 MESSAGE("Effect Plugins:")
 PRINT_SUMMARY ("Sample Rate Conversion ............" USE_SRC SAMPLERATE_FOUND)
+PRINT_SUMMARY ("SoX Resampler ....................." USE_SOXR SOXR_FOUND)
 PRINT_SUMMARY ("BS2B Plugin ......................." USE_BS2B BS2B_FOUND)
 PRINT_SUMMARY ("LADSPA Host ......................." USE_LADSPA 1)
 PRINT_SUMMARY ("Crossfade ........................." USE_CROSSFADE 1)
diff --git a/src/plugins/Effect/CMakeLists.txt b/src/plugins/Effect/CMakeLists.txt
index 1b9517799..88ef4f3c6 100644
--- a/src/plugins/Effect/CMakeLists.txt
+++ b/src/plugins/Effect/CMakeLists.txt
@@ -1,3 +1,4 @@
+SET(USE_SOXR TRUE CACHE BOOL "enable/disable SoX resampler plugin")
 SET(USE_SRC TRUE CACHE BOOL "enable/disable SRC plugin")
 SET(USE_BS2B TRUE CACHE BOOL "enable/disable bs2b plugin")
 SET(USE_LADSPA TRUE CACHE BOOL "enable/disable ladspa plugin")
@@ -8,6 +9,10 @@ IF(USE_SRC)
 add_subdirectory(srconverter)
 ENDIF(USE_SRC)
 
+IF(USE_SOXR)
+add_subdirectory(soxr)
+ENDIF(USE_SOXR)
+
 IF(USE_BS2B)
 add_subdirectory(bs2b)
 ENDIF(USE_BS2B)
diff --git a/src/plugins/Effect/soxr/CMakeLists.txt b/src/plugins/Effect/soxr/CMakeLists.txt
index 19341e529..57ec0ecac 100644
--- a/src/plugins/Effect/soxr/CMakeLists.txt
+++ b/src/plugins/Effect/soxr/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(libsrconverter)
+project(libsoxr)
 
 cmake_minimum_required(VERSION 2.4.7)
 
@@ -25,42 +25,40 @@ SET(QT_INCLUDES
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
-pkg_check_modules(SAMPLERATE samplerate)
+pkg_check_modules(SOXR soxr)
 
-include_directories(${SAMPLERATE_INCLUDE_DIRS})
-link_directories(${SAMPLERATE_LIBRARY_DIRS})
-ADD_DEFINITIONS(${SAMPLERATE_CFLAGS})
+include_directories(${SOXR_INCLUDE_DIRS})
+link_directories(${SOXR_LIBRARY_DIRS})
+ADD_DEFINITIONS(${SOXR_CFLAGS})
 
-SET(libsrconverter_SRCS
-    srconverter.cpp
+SET(libsoxr_SRCS
+    soxresampler.cpp
     settingsdialog.cpp
-    effectsrconverterfactory.cpp
+    effectsoxrfactory.cpp
 )
 
-SET(libsrconverter_HDRS
-    srconverter.h
+SET(libsoxr_HDRS
+    soxresampler.h
 )
 
-SET(libsrconverter_RCCS translations/translations.qrc)
+SET(libsoxr_RCCS translations/translations.qrc)
 
-QT4_ADD_RESOURCES(libsrconverter_RCC_SRCS ${libsrconverter_RCCS})
+QT4_ADD_RESOURCES(libsoxr_RCC_SRCS ${libsoxr_RCCS})
 
 # user interface
 
-
-SET(libsrconverter_UIS
+SET(libsoxr_UIS
     settingsdialog.ui
 )
 
-QT4_WRAP_UI(libsrconverter_UIS_H ${libsrconverter_UIS})
+QT4_WRAP_UI(libsoxr_UIS_H ${libsoxr_UIS})
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-IF(SAMPLERATE_FOUND)
-ADD_LIBRARY(srconverter MODULE ${libsrconverter_SRCS} ${libsrconverter_UIS_H}
-  ${libsrconverter_RCC_SRCS} ${libsrconverter_HDRS})
-add_dependencies(srconverter qmmp)
-target_link_libraries(srconverter ${QT_LIBRARIES} libqmmp ${SAMPLERATE_LDFLAGS})
-install(TARGETS srconverter DESTINATION ${LIB_DIR}/qmmp/Effect)
-ENDIF(SAMPLERATE_FOUND)
+IF(SOXR_FOUND)
+ADD_LIBRARY(soxr MODULE ${libsoxr_SRCS} ${libsoxr_UIS_H} ${libsoxr_RCC_SRCS} ${libsoxr_HDRS})
+add_dependencies(soxr qmmp)
+target_link_libraries(soxr ${QT_LIBRARIES} libqmmp ${SOXR_LDFLAGS})
+install(TARGETS soxr DESTINATION ${LIB_DIR}/qmmp/Effect)
+ENDIF(SOXR_FOUND)