updated cmake scripts

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

5 files changed, 27 insertions, 26 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c88711d53..d6a2ef7aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,6 +131,7 @@ PRINT_SUMMARY ("Sample Rate Conversion ............" USE_SRC SAMPLERATE_FOUND)
 PRINT_SUMMARY ("BS2B Plugin ......................." USE_BS2B BS2B_FOUND)
 PRINT_SUMMARY ("LADSPA Host ......................." USE_LADSPA 1)
 PRINT_SUMMARY ("Crossfade ........................." USE_CROSSFADE 1)
+PRINT_SUMMARY ("Extra Stereo ......................" USE_STEREO 1)
 
 MESSAGE("")
 MESSAGE("Visual Plugins:")
diff --git a/README b/README
index 9d3bafd88..8a8a50b84 100644
--- a/README
+++ b/README
@@ -20,6 +20,7 @@ DSP effects:
 - BS2B effect
 - Sample rate converter
 - LADSPA effects
+- Extra stereo
 
 Visual effects:
 - ProjectM visualization
@@ -103,7 +104,7 @@ Available options:
 - USE_MAD, USE_FLAC, USE_VORBIS, USE_MPC, USE_MODPLUG, USE_SNDFILE, USE_WAVPACK, USE_FFMPEG, USE_AAC, USE_CUE,
   USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME (decoders);
 - USE_ALSA, USE_OSS, USE_JACK, USE_PULSE, USE_NULL, USE_OSS4, USE_WAVEOUT (output plugins);
-- USE_SRC, USE_BS2B, USE_LADSPA, USE_CROSSFADE (effects);
+- USE_SRC, USE_BS2B, USE_LADSPA, USE_CROSSFADE, USE_STEREO (effects);
 - USE_ANALYZER, USE_PROJECTM (visualization);
 - USE_MPRIS, USE_SCROBBLER, USE_STATICON, USE_NOTIFIER, USE_LYRICS, USE_HAL, USE_HOTKEY, USE_FILEOPS, USE_COVER,
   USE_KDENOTIFY, USE_UDISKS (general plugins);
diff --git a/README.RUS b/README.RUS
index 4fdab1660..d40316a8b 100644
--- a/README.RUS
+++ b/README.RUS
@@ -20,6 +20,7 @@ Qmmp - Qt-based multimedia player
 - эффект BS2B
 - передискретизация
 - эффекты LADSPA
+- расширение стереобазы
 
 Визуальные эффекты:
 - визуализация projectM
@@ -102,7 +103,7 @@ cmake ./ -DUSE_JACK:BOOL=FALSE
 - USE_MAD, USE_FLAC, USE_VORBIS, USE_MPC, USE_MODPLUG, USE_SNDFILE, USE_WAVPACK, USE_FFMPEG, USE_AAC, USE_CUE,
   USE_MPLAYER, USE_CDA, USE_MIDI, USE_GME (декодеры);
 - USE_ALSA, USE_OSS, USE_JACK, USE_PULSE, USE_NULL, USE_OSS4, USE_WAVEOUT (модули  вывода);
-- USE_SRC, USE_BS2B, USE_LADSPA, USE_CROSSFADE (эффекты);
+- USE_SRC, USE_BS2B, USE_LADSPA, USE_CROSSFADE, USE_STEREO (эффекты);
 - USE_ANALYZER, USE_PROJECTM (визуализация);
 - USE_MPRIS, USE_SCROBBLER, USE_STATICON, USE_NOTIFIER, USE_LYRICS, USE_HAL, USE_HOTKEY, USE_FILEOPS, USE_COVER,
   USE_KDENOTIFY, USE_UDISKS (модули общего назначения);
diff --git a/src/plugins/Effect/CMakeLists.txt b/src/plugins/Effect/CMakeLists.txt
index c489f860c..93b530212 100644
--- a/src/plugins/Effect/CMakeLists.txt
+++ b/src/plugins/Effect/CMakeLists.txt
@@ -2,6 +2,7 @@ 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")
 SET(USE_CROSSFADE TRUE CACHE BOOL "enable/disable crossfade plugin")
+SET(USE_STEREO TRUE CACHE BOLL "enable/disable extra stereo plugin")
 
 IF(USE_SRC)
 add_subdirectory(srconverter)
@@ -18,3 +19,7 @@ ENDIF(USE_LADSPA)
 IF(USE_CROSSFADE)
 add_subdirectory(crossfade)
 ENDIF(USE_CROSSFADE)
+
+IF(USE_STEREO)
+add_subdirectory(stereo)
+ENDIF(USE_STEREO)
diff --git a/src/plugins/Effect/stereo/CMakeLists.txt b/src/plugins/Effect/stereo/CMakeLists.txt
index 3c9daf6c0..76c223b66 100644
--- a/src/plugins/Effect/stereo/CMakeLists.txt
+++ b/src/plugins/Effect/stereo/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(libbs2b)
+project(libstereo)
 
 cmake_minimum_required(VERSION 2.4.7)
 
@@ -25,44 +25,37 @@ SET(QT_INCLUDES
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
 
-SET(libbs2b_SRCS
-    bs2bplugin.cpp
+SET(libstereo_SRCS
+    stereoplugin.cpp
     settingsdialog.cpp
-    effectbs2bfactory.cpp
+    effectstereofactory.cpp
 )
 
-SET(libbs2b_MOC_HDRS
-    bs2bplugin.h
+SET(libstereo_MOC_HDRS
+    stereoplugin.h
     settingsdialog.h
-    effectbs2bfactory.h
+    effectstereofactory.h
 )
 
-SET(libbs2b_RCCS translations/translations.qrc)
+SET(libstereo_RCCS translations/translations.qrc)
 
-QT4_ADD_RESOURCES(libbs2b_RCC_SRCS ${libbs2b_RCCS})
+QT4_ADD_RESOURCES(libstereo_RCC_SRCS ${libstereo_RCCS})
 
-QT4_WRAP_CPP(libbs2b_MOC_SRCS ${libbs2b_MOC_HDRS})
-
-pkg_search_module(BS2B libbs2b>=3.0.0)
-
-include_directories(${BS2B_INCLUDE_DIRS})
-link_directories(${BS2B_LIBRARY_DIRS})
+QT4_WRAP_CPP(libstereo_MOC_SRCS ${libstereo_MOC_HDRS})
 
 # user interface
 
-SET(libbs2b_UIS
+SET(libstereo_UIS
     settingsdialog.ui
 )
 
-QT4_WRAP_UI(libbs2b_UIS_H ${libbs2b_UIS})
+QT4_WRAP_UI(libstereo_UIS_H ${libstereo_UIS})
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-IF(BS2B_FOUND)
-ADD_LIBRARY(bs2b MODULE ${libbs2b_SRCS} ${libbs2b_MOC_SRCS} ${libbs2b_UIS_H}
-  ${libbs2b_RCC_SRCS})
-add_dependencies(bs2b qmmp)
-target_link_libraries(bs2b ${QT_LIBRARIES} -lqmmp ${BS2B_LDFLAGS} ${BS2B_CFLAGS})
-install(TARGETS bs2b DESTINATION ${LIB_DIR}/qmmp/Effect)
-ENDIF(BS2B_FOUND)
+
+ADD_LIBRARY(stereo MODULE ${libstereo_SRCS} ${libstereo_MOC_SRCS} ${libstereo_UIS_H} ${libstereo_RCC_SRCS})
+add_dependencies(stereo qmmp)
+target_link_libraries(stereo ${QT_LIBRARIES} -lqmmp)
+install(TARGETS stereo DESTINATION ${LIB_DIR}/qmmp/Effect)