renaming experimental branch

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

11 files changed, 6 insertions, 126 deletions

diff --git a/src/plugins/Effect/bs2b/CMakeLists.txt b/src/plugins/Effect/bs2b/CMakeLists.txt
index 309ddaee2..d9a808c53 100644
--- a/src/plugins/Effect/bs2b/CMakeLists.txt
+++ b/src/plugins/Effect/bs2b/CMakeLists.txt
@@ -35,17 +35,10 @@ SET(libbs2b_HDRS
     bs2bplugin.h
 )
 
-SET(libbs2b_MOC_HDRS
-    settingsdialog.h
-    effectbs2bfactory.h
-)
-
 SET(libbs2b_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libbs2b_RCC_SRCS ${libbs2b_RCCS})
 
-QT4_WRAP_CPP(libbs2b_MOC_SRCS ${libbs2b_MOC_HDRS})
-
 pkg_search_module(BS2B libbs2b>=3.0.0)
 
 include_directories(${BS2B_INCLUDE_DIRS})
@@ -64,7 +57,7 @@ QT4_WRAP_UI(libbs2b_UIS_H ${libbs2b_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(BS2B_FOUND)
-ADD_LIBRARY(bs2b MODULE ${libbs2b_SRCS} ${libbs2b_MOC_SRCS} ${libbs2b_UIS_H}
+ADD_LIBRARY(bs2b MODULE ${libbs2b_SRCS} ${libbs2b_UIS_H}
   ${libbs2b_RCC_SRCS} ${libbs2b_HDRS})
 add_dependencies(bs2b qmmp)
 target_link_libraries(bs2b ${QT_LIBRARIES} -lqmmp ${BS2B_LDFLAGS})
diff --git a/src/plugins/Effect/bs2b/bs2b.pro b/src/plugins/Effect/bs2b/bs2b.pro
index 6882e6aae..c4dd9419d 100644
--- a/src/plugins/Effect/bs2b/bs2b.pro
+++ b/src/plugins/Effect/bs2b/bs2b.pro
@@ -15,26 +15,9 @@ CONFIG += warn_on \
 plugin \
 link_pkgconfig
 
-
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/bs2b_plugin_cs.ts \
-               translations/bs2b_plugin_de.ts \
-               translations/bs2b_plugin_zh_CN.ts \
-               translations/bs2b_plugin_zh_TW.ts \
-               translations/bs2b_plugin_uk_UA.ts \
-               translations/bs2b_plugin_pl.ts \
-               translations/bs2b_plugin_ru.ts \
-               translations/bs2b_plugin_it.ts \
-               translations/bs2b_plugin_tr.ts \
-               translations/bs2b_plugin_lt.ts \
-               translations/bs2b_plugin_nl.ts \
-               translations/bs2b_plugin_ja.ts \
-               translations/bs2b_plugin_es.ts \
-               translations/bs2b_plugin_sr_BA.ts \
-               translations/bs2b_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/Effect/crossfade/CMakeLists.txt b/src/plugins/Effect/crossfade/CMakeLists.txt
index 7775e3f11..d388e797d 100644
--- a/src/plugins/Effect/crossfade/CMakeLists.txt
+++ b/src/plugins/Effect/crossfade/CMakeLists.txt
@@ -35,17 +35,10 @@ SET(libcrossfade_HDRS
     crossfadeplugin.h
 )
 
-SET(libcrossfade_MOC_HDRS
-    settingsdialog.h
-    effectcrossfadefactory.h
-)
-
 SET(libcrossfade_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libcrossfade_RCC_SRCS ${libcrossfade_RCCS})
 
-QT4_WRAP_CPP(libcrossfade_MOC_SRCS ${libcrossfade_MOC_HDRS})
-
 # user interface
 
 SET(libcrossfade_UIS
@@ -58,7 +51,7 @@ QT4_WRAP_UI(libcrossfade_UIS_H ${libcrossfade_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 
-ADD_LIBRARY(crossfade MODULE ${libcrossfade_SRCS} ${libcrossfade_MOC_SRCS} ${libcrossfade_UIS_H} ${libcrossfade_RCC_SRCS}
+ADD_LIBRARY(crossfade MODULE ${libcrossfade_SRCS} ${libcrossfade_UIS_H} ${libcrossfade_RCC_SRCS}
 ${libcrossfade_HDRS})
 add_dependencies(crossfade qmmp)
 target_link_libraries(crossfade ${QT_LIBRARIES} -lqmmp)
diff --git a/src/plugins/Effect/crossfade/crossfade.pro b/src/plugins/Effect/crossfade/crossfade.pro
index 749eb1c33..7298a4939 100644
--- a/src/plugins/Effect/crossfade/crossfade.pro
+++ b/src/plugins/Effect/crossfade/crossfade.pro
@@ -17,22 +17,6 @@ plugin
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/crossfade_plugin_cs.ts \
-               translations/crossfade_plugin_de.ts \
-               translations/crossfade_plugin_zh_CN.ts \
-               translations/crossfade_plugin_zh_TW.ts \
-               translations/crossfade_plugin_uk_UA.ts \
-               translations/crossfade_plugin_pl.ts \
-               translations/crossfade_plugin_ru.ts \
-               translations/crossfade_plugin_it.ts \
-               translations/crossfade_plugin_tr.ts \
-               translations/crossfade_plugin_lt.ts \
-               translations/crossfade_plugin_nl.ts \
-               translations/crossfade_plugin_ja.ts \
-               translations/crossfade_plugin_es.ts \
-               translations/crossfade_plugin_sr_BA.ts \
-               translations/crossfade_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/Effect/ladspa/CMakeLists.txt b/src/plugins/Effect/ladspa/CMakeLists.txt
index 47e29be57..e6123d95f 100644
--- a/src/plugins/Effect/ladspa/CMakeLists.txt
+++ b/src/plugins/Effect/ladspa/CMakeLists.txt
@@ -38,20 +38,10 @@ SET(libladspa_HDRS
     ladspahelper.h
 )
 
-SET(libladspa_MOC_HDRS
-    ladspahost.h
-    ladspaslider.h
-    ladspabutton.h
-    settingsdialog.h
-    effectladspafactory.h
-)
-
 SET(libladspa_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libladspa_RCC_SRCS ${libladspa_RCCS})
 
-QT4_WRAP_CPP(libladspa_MOC_SRCS ${libladspa_MOC_HDRS})
-
 # user interface
 
 SET(libladspa_UIS
@@ -63,7 +53,7 @@ QT4_WRAP_UI(libladspa_UIS_H ${libladspa_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(ladspa MODULE ${libladspa_SRCS} ${libladspa_MOC_SRCS} ${libladspa_UIS_H}
+ADD_LIBRARY(ladspa MODULE ${libladspa_SRCS} ${libladspa_UIS_H}
   ${libladspa_RCC_SRCS} ${libladspa_HDRS})
 add_dependencies(ladspa qmmp)
 target_link_libraries(ladspa ${QT_LIBRARIES} -lqmmp ${CMAKE_DL_LIBS})
diff --git a/src/plugins/Effect/ladspa/ladspa.pro b/src/plugins/Effect/ladspa/ladspa.pro
index f86f92806..59f18dacd 100644
--- a/src/plugins/Effect/ladspa/ladspa.pro
+++ b/src/plugins/Effect/ladspa/ladspa.pro
@@ -26,22 +26,6 @@ LIBS += -lqmmp \
 
 linux-g++|linux-g++-32|linux-g++-64:LIBS += -ldl
 
-TRANSLATIONS = translations/ladspa_plugin_cs.ts \
-    translations/ladspa_plugin_de.ts \
-    translations/ladspa_plugin_zh_CN.ts \
-    translations/ladspa_plugin_zh_TW.ts \
-    translations/ladspa_plugin_uk_UA.ts \
-    translations/ladspa_plugin_pl.ts \
-    translations/ladspa_plugin_ru.ts \
-    translations/ladspa_plugin_it.ts \
-    translations/ladspa_plugin_tr.ts \
-    translations/ladspa_plugin_lt.ts \
-    translations/ladspa_plugin_nl.ts \
-    translations/ladspa_plugin_ja.ts \
-    translations/ladspa_plugin_es.ts \
-    translations/ladspa_plugin_sr_BA.ts \
-    translations/ladspa_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 isEmpty(LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Effect
diff --git a/src/plugins/Effect/srconverter/CMakeLists.txt b/src/plugins/Effect/srconverter/CMakeLists.txt
index 15decb947..c46286bd9 100644
--- a/src/plugins/Effect/srconverter/CMakeLists.txt
+++ b/src/plugins/Effect/srconverter/CMakeLists.txt
@@ -41,18 +41,10 @@ SET(libsrconverter_HDRS
     srconverter.h
 )
 
-SET(libsrconverter_MOC_HDRS
-    
-    settingsdialog.h
-    effectsrconverterfactory.h
-)
-
 SET(libsrconverter_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libsrconverter_RCC_SRCS ${libsrconverter_RCCS})
 
-QT4_WRAP_CPP(libsrconverter_MOC_SRCS ${libsrconverter_MOC_HDRS})
-
 # user interface
 
 
@@ -66,7 +58,7 @@ QT4_WRAP_UI(libsrconverter_UIS_H ${libsrconverter_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(SAMPLERATE_FOUND)
-ADD_LIBRARY(srconverter MODULE ${libsrconverter_SRCS} ${libsrconverter_MOC_SRCS} ${libsrconverter_UIS_H}
+ADD_LIBRARY(srconverter MODULE ${libsrconverter_SRCS} ${libsrconverter_UIS_H}
   ${libsrconverter_RCC_SRCS} ${libsrconverter_HDRS})
 add_dependencies(srconverter qmmp)
 target_link_libraries(srconverter ${QT_LIBRARIES} -lqmmp ${SAMPLERATE_LDFLAGS})
diff --git a/src/plugins/Effect/srconverter/srconverter.h b/src/plugins/Effect/srconverter/srconverter.h
index b214c866f..ef2501525 100644
--- a/src/plugins/Effect/srconverter/srconverter.h
+++ b/src/plugins/Effect/srconverter/srconverter.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -44,7 +44,6 @@ private:
     int m_srcError;
     int m_converter_type;
     int m_sz; //sample size
-    quint32 m_freq;
 };
 
 #endif
diff --git a/src/plugins/Effect/srconverter/srconverter.pro b/src/plugins/Effect/srconverter/srconverter.pro
index bbc7c61de..b9e809a8e 100644
--- a/src/plugins/Effect/srconverter/srconverter.pro
+++ b/src/plugins/Effect/srconverter/srconverter.pro
@@ -20,22 +20,6 @@ TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp -L/usr/lib -I/usr/include
 
-TRANSLATIONS = translations/srconverter_plugin_cs.ts \
-               translations/srconverter_plugin_de.ts \
-               translations/srconverter_plugin_zh_CN.ts \
-               translations/srconverter_plugin_zh_TW.ts \
-               translations/srconverter_plugin_uk_UA.ts \
-               translations/srconverter_plugin_pl.ts \
-               translations/srconverter_plugin_ru.ts \
-               translations/srconverter_plugin_it.ts \
-               translations/srconverter_plugin_tr.ts \
-               translations/srconverter_plugin_lt.ts \
-               translations/srconverter_plugin_nl.ts \
-               translations/srconverter_plugin_ja.ts \
-               translations/srconverter_plugin_es.ts \
-               translations/srconverter_plugin_sr_BA.ts \
-               translations/srconverter_plugin_sr_RS.ts
-               
 RESOURCES = translations/translations.qrc
 
 isEmpty(LIB_DIR){
diff --git a/src/plugins/Effect/stereo/CMakeLists.txt b/src/plugins/Effect/stereo/CMakeLists.txt
index 7717d5302..eb5aafe36 100644
--- a/src/plugins/Effect/stereo/CMakeLists.txt
+++ b/src/plugins/Effect/stereo/CMakeLists.txt
@@ -35,17 +35,10 @@ SET(libstereo_HDRS
     stereoplugin.h
 )
 
-SET(libstereo_MOC_HDRS
-    settingsdialog.h
-    effectstereofactory.h
-)
-
 SET(libstereo_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libstereo_RCC_SRCS ${libstereo_RCCS})
 
-QT4_WRAP_CPP(libstereo_MOC_SRCS ${libstereo_MOC_HDRS})
-
 # user interface
 
 SET(libstereo_UIS
@@ -58,7 +51,7 @@ QT4_WRAP_UI(libstereo_UIS_H ${libstereo_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 
-ADD_LIBRARY(stereo MODULE ${libstereo_SRCS} ${libstereo_MOC_SRCS} ${libstereo_UIS_H} ${libstereo_RCC_SRCS} ${libstereo_HDRS})
+ADD_LIBRARY(stereo MODULE ${libstereo_SRCS} ${libstereo_UIS_H} ${libstereo_RCC_SRCS} ${libstereo_HDRS})
 add_dependencies(stereo qmmp)
 target_link_libraries(stereo ${QT_LIBRARIES} -lqmmp)
 install(TARGETS stereo DESTINATION ${LIB_DIR}/qmmp/Effect)
diff --git a/src/plugins/Effect/stereo/stereo.pro b/src/plugins/Effect/stereo/stereo.pro
index d5136cbea..c89c2309d 100644
--- a/src/plugins/Effect/stereo/stereo.pro
+++ b/src/plugins/Effect/stereo/stereo.pro
@@ -17,21 +17,6 @@ plugin
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/stereo_plugin_cs.ts \
-               translations/stereo_plugin_de.ts \
-               translations/stereo_plugin_zh_CN.ts \
-               translations/stereo_plugin_zh_TW.ts \
-               translations/stereo_plugin_uk_UA.ts \
-               translations/stereo_plugin_pl.ts \
-               translations/stereo_plugin_ru.ts \
-               translations/stereo_plugin_it.ts \
-               translations/stereo_plugin_tr.ts \
-               translations/stereo_plugin_lt.ts \
-               translations/stereo_plugin_nl.ts \
-               translations/stereo_plugin_ja.ts \
-               translations/stereo_plugin_es.ts \
-               translations/stereo_plugin_sr_BA.ts \
-               translations/stereo_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
 FORMS += settingsdialog.ui