renaming experimental branch

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

32 files changed, 25 insertions, 390 deletions

diff --git a/src/plugins/Input/aac/CMakeLists.txt b/src/plugins/Input/aac/CMakeLists.txt
index 4daf39098..7238af106 100644
--- a/src/plugins/Input/aac/CMakeLists.txt
+++ b/src/plugins/Input/aac/CMakeLists.txt
@@ -74,23 +74,16 @@ SET(libaac_HDRS
   aacfile.h
 )
 
-SET(libaac_MOC_HDRS
-  decoderaacfactory.h
-  aacmetadatamodel.h
-)
-
 SET(libaac_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libaac_RCC_SRCS ${libaac_RCCS})
 
-QT4_WRAP_CPP(libaac_MOC_SRCS ${libaac_MOC_HDRS})
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FAAD_FOUND)
-ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_MOC_SRCS} ${libaac_RCC_SRCS} ${libaac_HDRS})
+ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_RCC_SRCS} ${libaac_HDRS})
 add_dependencies(aac qmmp)
 target_link_libraries(aac ${QT_LIBRARIES} -lqmmp -lfaad ${TAGLIB_LDFLAGS})
 install(TARGETS aac DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/aac/aac.pro b/src/plugins/Input/aac/aac.pro
index 3dbabd407..b5759e714 100644
--- a/src/plugins/Input/aac/aac.pro
+++ b/src/plugins/Input/aac/aac.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decoderaacfactory.h \
     decoder_aac.h \
     aacfile.h \
@@ -21,21 +21,6 @@ LIBS += -lqmmp \
     -L/usr/lib \
     -I/usr/include
 PKGCONFIG += taglib
-TRANSLATIONS = translations/aac_plugin_ru.ts \
-    translations/aac_plugin_uk_UA.ts \
-    translations/aac_plugin_zh_CN.ts \
-    translations/aac_plugin_zh_TW.ts \
-    translations/aac_plugin_cs.ts \
-    translations/aac_plugin_pl.ts \
-    translations/aac_plugin_de.ts \
-    translations/aac_plugin_it.ts \
-    translations/aac_plugin_tr.ts \
-    translations/aac_plugin_lt.ts \
-    translations/aac_plugin_nl.ts \
-    translations/aac_plugin_ja.ts \
-    translations/aac_plugin_es.ts \
-    translations/aac_plugin_sr_BA.ts \
-    translations/aac_plugin_sr_RS.ts
 
 RESOURCES = translations/translations.qrc
 isEmpty(LIB_DIR):LIB_DIR = /lib
diff --git a/src/plugins/Input/cdaudio/CMakeLists.txt b/src/plugins/Input/cdaudio/CMakeLists.txt
index 59733fde9..dccfc530b 100644
--- a/src/plugins/Input/cdaudio/CMakeLists.txt
+++ b/src/plugins/Input/cdaudio/CMakeLists.txt
@@ -38,17 +38,10 @@ SET(libcdaudio_HDRS
   decoder_cdaudio.h
 )
 
-SET(libcdaudio_MOC_HDRS
-  settingsdialog.h
-  decodercdaudiofactory.h
-)
-
 SET(libcdaudio_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libcdaudio_RCC_SRCS ${libcdaudio_RCCS})
 
-QT4_WRAP_CPP(libcdaudio_MOC_SRCS ${libcdaudio_MOC_HDRS})
-
 # user interface
 
 SET(libcdaudio_UIS
@@ -61,7 +54,7 @@ QT4_WRAP_UI(libcdaudio_UIS_H ${libcdaudio_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(CDIO_FOUND)
-ADD_LIBRARY(cdaudio MODULE ${libcdaudio_SRCS} ${libcdaudio_MOC_SRCS} ${libcdaudio_UIS_H} ${libcdaudio_RCC_SRCS}
+ADD_LIBRARY(cdaudio MODULE ${libcdaudio_SRCS} ${libcdaudio_UIS_H} ${libcdaudio_RCC_SRCS}
 ${libcdaudio_HDRS})
 add_dependencies(cdaudio qmmp)
 target_link_libraries(cdaudio ${QT_LIBRARIES} -lqmmp ${CDIO_LDFLAGS})
diff --git a/src/plugins/Input/cdaudio/cdaudio.pro b/src/plugins/Input/cdaudio/cdaudio.pro
index ec21e3ddf..903202edf 100644
--- a/src/plugins/Input/cdaudio/cdaudio.pro
+++ b/src/plugins/Input/cdaudio/cdaudio.pro
@@ -16,23 +16,6 @@ TEMPLATE = lib
 
 TARGET =$$PLUGINS_PREFIX/Input/cdaudio
 
-
-TRANSLATIONS = translations/cdaudio_plugin_ru.ts \
-               translations/cdaudio_plugin_uk_UA.ts \
-               translations/cdaudio_plugin_zh_CN.ts \
-               translations/cdaudio_plugin_zh_TW.ts \
-               translations/cdaudio_plugin_cs.ts \
-               translations/cdaudio_plugin_pl.ts \
-               translations/cdaudio_plugin_de.ts \
-               translations/cdaudio_plugin_it.ts \
-               translations/cdaudio_plugin_tr.ts \
-               translations/cdaudio_plugin_lt.ts \
-               translations/cdaudio_plugin_nl.ts \
-               translations/cdaudio_plugin_ja.ts \
-               translations/cdaudio_plugin_es.ts \
-               translations/cdaudio_plugin_sr_BA.ts \
-               translations/cdaudio_plugin_sr_RS.ts
- 
 RESOURCES = translations/translations.qrc
 
 
diff --git a/src/plugins/Input/cue/CMakeLists.txt b/src/plugins/Input/cue/CMakeLists.txt
index 9d1463696..ba2e4fe02 100644
--- a/src/plugins/Input/cue/CMakeLists.txt
+++ b/src/plugins/Input/cue/CMakeLists.txt
@@ -46,18 +46,10 @@ SET(libcue_HDRS
   cueparser.h
 )
 
-SET(libcue_MOC_HDRS
-  decodercuefactory.h
-  settingsdialog.h
-  cuemetadatamodel.h
-)
-
 SET(libcue_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libcue_RCC_SRCS ${libcue_RCCS})
 
-QT4_WRAP_CPP(libcue_MOC_SRCS ${libcue_MOC_HDRS})
-
 # user interface
 
 
@@ -70,7 +62,7 @@ QT4_WRAP_UI(libcue_UIS_H ${libcue_UIS})
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-ADD_LIBRARY(cue MODULE ${libcue_SRCS} ${libcue_MOC_SRCS} ${libcue_RCC_SRCS} ${libcue_UIS_H} ${libcue_HDRS})
+ADD_LIBRARY(cue MODULE ${libcue_SRCS} ${libcue_RCC_SRCS} ${libcue_UIS_H} ${libcue_HDRS})
 add_dependencies(cue qmmp)
 IF(USE_ENCA AND ENCA_FOUND)
 target_link_libraries(cue ${QT_LIBRARIES} -lqmmp ${ENCA_LDFLAGS})
diff --git a/src/plugins/Input/cue/cue.pro b/src/plugins/Input/cue/cue.pro
index c8f205eec..48fe2bda7 100644
--- a/src/plugins/Input/cue/cue.pro
+++ b/src/plugins/Input/cue/cue.pro
@@ -36,24 +36,8 @@ contains(CONFIG, WITH_ENCA){
 
 }
 
-TRANSLATIONS = translations/cue_plugin_ru.ts \
-    translations/cue_plugin_uk_UA.ts \
-    translations/cue_plugin_zh_CN.ts \
-    translations/cue_plugin_zh_TW.ts \
-    translations/cue_plugin_cs.ts \
-    translations/cue_plugin_pl.ts \
-    translations/cue_plugin_de.ts \
-    translations/cue_plugin_it.ts \
-    translations/cue_plugin_tr.ts \
-    translations/cue_plugin_lt.ts \
-    translations/cue_plugin_nl.ts \
-    translations/cue_plugin_ja.ts \
-    translations/cue_plugin_es.ts \
-    translations/cue_plugin_sr_BA.ts \
-    translations/cue_plugin_sr_RS.ts
-  
 RESOURCES = translations/translations.qrc
-unix { 
+unix {
     isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     desktop.files = qmmp_cue.desktop
diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt
index b36645f98..615096abf 100644
--- a/src/plugins/Input/ffmpeg/CMakeLists.txt
+++ b/src/plugins/Input/ffmpeg/CMakeLists.txt
@@ -47,18 +47,10 @@ SET(libffmpeg_HDRS
   decoder_ffmpeg.h
 )
 
-SET(libffmpeg_MOC_HDRS
-  decoderffmpegfactory.h
-  ffmpegmetadatamodel.h
-  settingsdialog.h
-)
-
 SET(libffmpeg_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libffmpeg_RCC_SRCS ${libffmpeg_RCCS})
 
-QT4_WRAP_CPP(libffmpeg_MOC_SRCS ${libffmpeg_MOC_HDRS})
-
 # user interface
 
 
@@ -72,7 +64,7 @@ QT4_WRAP_UI(libffmpeg_UIS_H ${libffmpeg_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FFMPEG_FOUND)
-ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H}
+ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H}
   ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS})
 add_dependencies(ffmpeg qmmp)
 target_link_libraries(ffmpeg ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS})
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
index 41ed21a8f..3e4304d89 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
@@ -112,6 +112,7 @@ bool DecoderFFmpeg::initialize()
     ic = avformat_alloc_context();
 
     AVProbeData  pd;
+    memset(&pd, 0, sizeof(pd));
     uint8_t buf[PROBE_BUFFER_SIZE + AVPROBE_PADDING_SIZE];
     pd.filename = m_path.toLocal8Bit().constData();
     pd.buf_size = input()->peek((char*)buf, sizeof(buf) - AVPROBE_PADDING_SIZE);
diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro
index a1b0458d6..0897240ff 100644
--- a/src/plugins/Input/ffmpeg/ffmpeg.pro
+++ b/src/plugins/Input/ffmpeg/ffmpeg.pro
@@ -40,21 +40,4 @@ win32 {
 
 DEFINES += __STDC_CONSTANT_MACROS
 
-TRANSLATIONS = translations/ffmpeg_plugin_ru.ts \
-    translations/ffmpeg_plugin_uk_UA.ts \
-    translations/ffmpeg_plugin_zh_CN.ts \
-    translations/ffmpeg_plugin_zh_TW.ts \
-    translations/ffmpeg_plugin_cs.ts \
-    translations/ffmpeg_plugin_pl.ts \
-    translations/ffmpeg_plugin_de.ts \
-    translations/ffmpeg_plugin_it.ts \
-    translations/ffmpeg_plugin_tr.ts \
-    translations/ffmpeg_plugin_lt.ts \
-    translations/ffmpeg_plugin_nl.ts \
-    translations/ffmpeg_plugin_ja.ts \
-    translations/ffmpeg_plugin_es.ts \
-    translations/ffmpeg_plugin_sr_BA.ts \
-    translations/ffmpeg_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
-
diff --git a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt
index f480476dd..a6e295a41 100644
--- a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt
+++ b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt
@@ -53,18 +53,10 @@ SET(libffmpeg_HDRS
   decoder_ffmpeg.h
 )
 
-SET(libffmpeg_MOC_HDRS
-  decoderffmpegfactory.h
-  ffmpegmetadatamodel.h
-  settingsdialog.h
-)
-
 SET(libffmpeg_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libffmpeg_RCC_SRCS ${libffmpeg_RCCS})
 
-QT4_WRAP_CPP(libffmpeg_MOC_SRCS ${libffmpeg_MOC_HDRS})
-
 # user interface
 
 
@@ -78,7 +70,7 @@ QT4_WRAP_UI(libffmpeg_UIS_H ${libffmpeg_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FFMPEG_LEGACY_FOUND)
-ADD_LIBRARY(ffmpeg_legacy MODULE ${libffmpeg_SRCS} ${libffmpeg_MOC_SRCS} ${libffmpeg_UIS_H}
+ADD_LIBRARY(ffmpeg_legacy MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H}
   ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS})
 add_dependencies(ffmpeg_legacy qmmp)
 target_link_libraries(ffmpeg_legacy ${QT_LIBRARIES} -lqmmp ${FFMPEG_LEGACY_LDFLAGS})
diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
index 6713487e1..1e92b1976 100644
--- a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
+++ b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
@@ -40,21 +40,5 @@ win32 {
 
 DEFINES += __STDC_CONSTANT_MACROS
 
-TRANSLATIONS = translations/ffmpeg_plugin_legacy_ru.ts \
-    translations/ffmpeg_plugin_legacy_uk_UA.ts \
-    translations/ffmpeg_plugin_legacy_zh_CN.ts \
-    translations/ffmpeg_plugin_legacy_zh_TW.ts \
-    translations/ffmpeg_plugin_legacy_cs.ts \
-    translations/ffmpeg_plugin_legacy_pl.ts \
-    translations/ffmpeg_plugin_legacy_de.ts \
-    translations/ffmpeg_plugin_legacy_it.ts \
-    translations/ffmpeg_plugin_legacy_tr.ts \
-    translations/ffmpeg_plugin_legacy_lt.ts \
-    translations/ffmpeg_plugin_legacy_nl.ts \
-    translations/ffmpeg_plugin_legacy_ja.ts \
-    translations/ffmpeg_plugin_legacy_es.ts \
-    translations/ffmpeg_plugin_legacy_sr_BA.ts \
-    translations/ffmpeg_plugin_legacy_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt
index 5fc0b81c8..5611d5325 100644
--- a/src/plugins/Input/flac/CMakeLists.txt
+++ b/src/plugins/Input/flac/CMakeLists.txt
@@ -52,23 +52,16 @@ SET(libflac_HDRS
   replaygainreader.h
 )
 
-SET(libflac_MOC_HDRS
-  decoderflacfactory.h
-  flacmetadatamodel.h
-)
-
 SET(libflac_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libflac_RCC_SRCS ${libflac_RCCS})
 
-QT4_WRAP_CPP(libflac_MOC_SRCS ${libflac_MOC_HDRS})
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(FLAC_FOUND)
-ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_MOC_SRCS} ${libflac_RCC_SRCS} ${libflac_HDRS})
+ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_RCC_SRCS} ${libflac_HDRS})
 add_dependencies(flac qmmp)
 target_link_libraries(flac ${QT_LIBRARIES} -lqmmp ${FLAC_LDFLAGS} ${TAGLIB_LDFLAGS})
 install(TARGETS flac DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro
index 45a78077a..e412b1eb4 100644
--- a/src/plugins/Input/flac/flac.pro
+++ b/src/plugins/Input/flac/flac.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decoderflacfactory.h \
     decoder_flac.h \
     cueparser.h \
@@ -19,23 +19,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/flac_plugin_ru.ts \
-    translations/flac_plugin_uk_UA.ts \
-    translations/flac_plugin_zh_CN.ts \
-    translations/flac_plugin_zh_TW.ts \
-    translations/flac_plugin_cs.ts \
-    translations/flac_plugin_pl.ts \
-    translations/flac_plugin_de.ts \
-    translations/flac_plugin_it.ts \
-    translations/flac_plugin_tr.ts \
-    translations/flac_plugin_lt.ts \
-    translations/flac_plugin_nl.ts \
-    translations/flac_plugin_ja.ts \
-    translations/flac_plugin_es.ts \
-    translations/flac_plugin_sr_BA.ts \
-    translations/flac_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt
index fd871ca1b..b4aca13cf 100644
--- a/src/plugins/Input/gme/CMakeLists.txt
+++ b/src/plugins/Input/gme/CMakeLists.txt
@@ -49,22 +49,16 @@ SET(libgme_HDRS
   gmehelper.h
 )
 
-SET(libgme_MOC_HDRS
-  decodergmefactory.h 
-)
-
 SET(libgme_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libgme_RCC_SRCS ${libgme_RCCS})
 
-QT4_WRAP_CPP(libgme_MOC_SRCS ${libgme_MOC_HDRS})
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(GME_FOUND)
-ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_MOC_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS})
+ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS})
 add_dependencies(gme qmmp)
 target_link_libraries(gme ${QT_LIBRARIES} -lqmmp ${GME_LIB})
 install(TARGETS gme DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/gme/gme.pro b/src/plugins/Input/gme/gme.pro
index 668189ebc..76728e884 100644
--- a/src/plugins/Input/gme/gme.pro
+++ b/src/plugins/Input/gme/gme.pro
@@ -13,21 +13,6 @@ CONFIG += warn_on \
     plugin
 TEMPLATE = lib
 
-TRANSLATIONS = translations/gme_plugin_it.ts \
-               translations/gme_plugin_ru.ts \
-               translations/gme_plugin_cs.ts \
-               translations/gme_plugin_de.ts \
-               translations/gme_plugin_zh_CN.ts \
-               translations/gme_plugin_zh_TW.ts \
-               translations/gme_plugin_uk_UA.ts \
-               translations/gme_plugin_pl.ts \
-               translations/gme_plugin_tr.ts \
-               translations/gme_plugin_lt.ts \
-               translations/gme_plugin_nl.ts \
-               translations/gme_plugin_ja.ts \
-               translations/gme_plugin_sr_BA.ts \
-               translations/gme_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix{
diff --git a/src/plugins/Input/mad/CMakeLists.txt b/src/plugins/Input/mad/CMakeLists.txt
index 7120face0..e44c74d75 100644
--- a/src/plugins/Input/mad/CMakeLists.txt
+++ b/src/plugins/Input/mad/CMakeLists.txt
@@ -48,18 +48,10 @@ SET(libmad_HDRS
   replaygainreader.h
 )
 
-SET(libmad_MOC_HDRS
-  settingsdialog.h
-  decodermadfactory.h
-  mpegmetadatamodel.h
-)
-
 SET(libmad_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libmad_RCC_SRCS ${libmad_RCCS})
 
-QT4_WRAP_CPP(libmad_MOC_SRCS ${libmad_MOC_HDRS})
-
 # user interface
 
 
@@ -73,7 +65,7 @@ QT4_WRAP_UI(libmad_UIS_H ${libmad_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(MAD_FOUND)
-ADD_LIBRARY(mad MODULE ${libmad_SRCS} ${libmad_MOC_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS} ${libmad_HDRS})
+ADD_LIBRARY(mad MODULE ${libmad_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS} ${libmad_HDRS})
 add_dependencies(mad qmmp)
 target_link_libraries(mad ${QT_LIBRARIES} -lqmmp ${MAD_LDFLAGS} ${TAGLIB_LDFLAGS})
 install(TARGETS mad DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/mad/mad.pro b/src/plugins/Input/mad/mad.pro
index 74f902380..e7d9156db 100644
--- a/src/plugins/Input/mad/mad.pro
+++ b/src/plugins/Input/mad/mad.pro
@@ -21,26 +21,8 @@ CONFIG += warn_on \
     link_pkgconfig
 TEMPLATE = lib
 
-
-TRANSLATIONS = translations/mad_plugin_ru.ts \
-    translations/mad_plugin_uk_UA.ts \
-    translations/mad_plugin_zh_CN.ts \
-    translations/mad_plugin_zh_TW.ts \
-    translations/mad_plugin_cs.ts \
-    translations/mad_plugin_pl.ts \
-    translations/mad_plugin_de.ts \
-    translations/mad_plugin_it.ts \
-    translations/mad_plugin_tr.ts \
-    translations/mad_plugin_tr.ts \
-    translations/mad_plugin_lt.ts \
-    translations/mad_plugin_nl.ts \
-    translations/mad_plugin_ja.ts \
-    translations/mad_plugin_es.ts \
-    translations/mad_plugin_sr_BA.ts \
-    translations/mad_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
-unix { 
+unix {
     isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
diff --git a/src/plugins/Input/modplug/CMakeLists.txt b/src/plugins/Input/modplug/CMakeLists.txt
index cbc000843..bc38fee1e 100644
--- a/src/plugins/Input/modplug/CMakeLists.txt
+++ b/src/plugins/Input/modplug/CMakeLists.txt
@@ -58,20 +58,10 @@ SET(libmodplug_HDRS
   decoder_modplug.h
 )
 
-SET(libmodplug_MOC_HDRS
-  decodermodplugfactory.h
-  
-  modplugmetadatamodel.h
-  settingsdialog.h
-  archivereader.h
-)
-
 SET(libmodplug_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libmodplug_RCC_SRCS ${libmodplug_RCCS})
 
-QT4_WRAP_CPP(libmodplug_MOC_SRCS ${libmodplug_MOC_HDRS})
-
 # user interface
 
 SET(libmodplug_UIS
@@ -84,7 +74,7 @@ QT4_WRAP_UI(libmodplug_UIS_H ${libmodplug_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(MODPLUG_FOUND)
-ADD_LIBRARY(modplug MODULE ${libmodplug_SRCS} ${libmodplug_MOC_SRCS} ${libmodplug_UIS_H}
+ADD_LIBRARY(modplug MODULE ${libmodplug_SRCS} ${libmodplug_UIS_H}
   ${libmodplug_RCC_SRCS} ${libmodplug_HDRS})
 add_dependencies(modplug qmmp)
 target_link_libraries(modplug ${QT_LIBRARIES} -lqmmp ${MODPLUG_LDFLAGS})
diff --git a/src/plugins/Input/modplug/modplug.pro b/src/plugins/Input/modplug/modplug.pro
index 90a067a48..dc2d5a9bb 100644
--- a/src/plugins/Input/modplug/modplug.pro
+++ b/src/plugins/Input/modplug/modplug.pro
@@ -21,23 +21,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/modplug_plugin_cs.ts \
-    translations/modplug_plugin_de.ts \
-    translations/modplug_plugin_zh_CN.ts \
-    translations/modplug_plugin_zh_TW.ts \
-    translations/modplug_plugin_ru.ts \
-    translations/modplug_plugin_pl.ts \
-    translations/modplug_plugin_uk_UA.ts \
-    translations/modplug_plugin_it.ts \
-    translations/modplug_plugin_tr.ts \
-    translations/modplug_plugin_lt.ts \
-    translations/modplug_plugin_nl.ts \
-    translations/modplug_plugin_ja.ts \
-    translations/modplug_plugin_es.ts \
-    translations/modplug_plugin_sr_BA.ts \
-    translations/modplug_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/mpc/CMakeLists.txt b/src/plugins/Input/mpc/CMakeLists.txt
index c8bdd0860..71b13b439 100644
--- a/src/plugins/Input/mpc/CMakeLists.txt
+++ b/src/plugins/Input/mpc/CMakeLists.txt
@@ -57,21 +57,14 @@ SET(libmpc_HDRS
   decoder_mpc.h
 )
 
-SET(libmpc_MOC_HDRS
-  decodermpcfactory.h
-  mpcmetadatamodel.h
-)
-
 SET(libmpc_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libmpc_RCC_SRCS ${libmpc_RCCS})
 
-QT4_WRAP_CPP(libmpc_MOC_SRCS ${libmpc_MOC_HDRS})
-
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(MPC_FOUND)
-ADD_LIBRARY(mpc MODULE ${libmpc_SRCS} ${libmpc_MOC_SRCS} ${libmpc_RCC_SRCS} ${libmpc_HDRS})
+ADD_LIBRARY(mpc MODULE ${libmpc_SRCS} ${libmpc_RCC_SRCS} ${libmpc_HDRS})
 add_dependencies(mpc qmmp)
 target_link_libraries(mpc ${QT_LIBRARIES} -lqmmp ${MPC_LIB} ${TAGLIB_LDFLAGS})
 install(TARGETS mpc DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/mpc/mpc.pro b/src/plugins/Input/mpc/mpc.pro
index 41ef3d4c6..93ed9df2c 100644
--- a/src/plugins/Input/mpc/mpc.pro
+++ b/src/plugins/Input/mpc/mpc.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decodermpcfactory.h \
     decoder_mpc.h \
     mpcmetadatamodel.h
@@ -15,22 +15,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-TRANSLATIONS = translations/mpc_plugin_ru.ts \
-    translations/mpc_plugin_uk_UA.ts \
-    translations/mpc_plugin_zh_CN.ts \
-    translations/mpc_plugin_zh_TW.ts \
-    translations/mpc_plugin_cs.ts \
-    translations/mpc_plugin_pl.ts \
-    translations/mpc_plugin_de.ts \
-    translations/mpc_plugin_it.ts \
-    translations/mpc_plugin_tr.ts \
-    translations/mpc_plugin_lt.ts \
-    translations/mpc_plugin_nl.ts \
-    translations/mpc_plugin_ja.ts \
-    translations/mpc_plugin_es.ts \
-    translations/mpc_plugin_sr_BA.ts \
-    translations/mpc_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 unix {
     isEmpty(LIB_DIR):LIB_DIR = /lib
diff --git a/src/plugins/Input/opus/CMakeLists.txt b/src/plugins/Input/opus/CMakeLists.txt
index a34b087b1..ac4b72d6a 100644
--- a/src/plugins/Input/opus/CMakeLists.txt
+++ b/src/plugins/Input/opus/CMakeLists.txt
@@ -50,17 +50,10 @@ SET(libopus_HDRS
   tdebug.h
 )
 
-SET(libopus_MOC_HDRS
-  decoderopusfactory.h
-  opusmetadatamodel.h
-)
-
 SET(libopus_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libopus_RCC_SRCS ${libopus_RCCS})
 
-QT4_WRAP_CPP(libopus_MOC_SRCS ${libopus_MOC_HDRS})
-
 # user interface
 
 QT4_WRAP_UI(libopus_UIS_H ${libopus_UIS})
@@ -69,7 +62,7 @@ QT4_WRAP_UI(libopus_UIS_H ${libopus_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(OPUS_FOUND)
-ADD_LIBRARY(opus MODULE ${libopus_SRCS} ${libopus_MOC_SRCS} ${libopus_RCC_SRCS} ${libopus_HDRS})
+ADD_LIBRARY(opus MODULE ${libopus_SRCS} ${libopus_RCC_SRCS} ${libopus_HDRS})
 add_dependencies(opus qmmp)
 target_link_libraries(opus ${QT_LIBRARIES} -lqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS})
 install(TARGETS opus DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/opus/opus.pro b/src/plugins/Input/opus/opus.pro
index 911606ee0..3276e6f7b 100644
--- a/src/plugins/Input/opus/opus.pro
+++ b/src/plugins/Input/opus/opus.pro
@@ -23,23 +23,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/opus_plugin_ru.ts \
-    translations/opus_plugin_uk_UA.ts \
-    translations/opus_plugin_zh_CN.ts \
-    translations/opus_plugin_zh_TW.ts \
-    translations/opus_plugin_cs.ts \
-    translations/opus_plugin_pl.ts \
-    translations/opus_plugin_de.ts \
-    translations/opus_plugin_it.ts \
-    translations/opus_plugin_tr.ts \
-    translations/opus_plugin_lt.ts \
-    translations/opus_plugin_nl.ts \
-    translations/opus_plugin_ja.ts \
-    translations/opus_plugin_es.ts \
-    translations/opus_plugin_sr_BA.ts \
-    translations/opus_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 
diff --git a/src/plugins/Input/sid/CMakeLists.txt b/src/plugins/Input/sid/CMakeLists.txt
index 2fd786dc9..db662630f 100644
--- a/src/plugins/Input/sid/CMakeLists.txt
+++ b/src/plugins/Input/sid/CMakeLists.txt
@@ -46,17 +46,10 @@ SET(libsid_HDRS
   sidhelper.h
 )
 
-SET(libsid_MOC_HDRS
-  decodersidfactory.h
-  settingsdialog.h
-)
-
 SET(libsid_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libsid_RCC_SRCS ${libsid_RCCS})
 
-QT4_WRAP_CPP(libsid_MOC_SRCS ${libsid_MOC_HDRS})
-
 # user interface
 
 SET(libsid_UIS
@@ -69,7 +62,7 @@ QT4_WRAP_UI(libsid_UIS_H ${libsid_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(SIDPLAYFP_FOUND)
-ADD_LIBRARY(sid MODULE ${libsid_SRCS} ${libsid_MOC_SRCS} ${libsid_UIS_H}
+ADD_LIBRARY(sid MODULE ${libsid_SRCS} ${libsid_UIS_H}
   ${libsid_RCC_SRCS} ${libsid_HDRS})
 add_dependencies(sid qmmp)
 target_link_libraries(sid ${QT_LIBRARIES} -lqmmp ${SIDPLAYFP_LDFLAGS})
diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt
index 4e96aca36..30467ce26 100644
--- a/src/plugins/Input/sndfile/CMakeLists.txt
+++ b/src/plugins/Input/sndfile/CMakeLists.txt
@@ -41,23 +41,16 @@ SET(libsndfile_HDRS
   decoder_sndfile.h
 )
 
-SET(libsndfile_MOC_HDRS
-  decodersndfilefactory.h
-)
-
 SET(libsndfile_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libsndfile_RCC_SRCS ${libsndfile_RCCS})
 
-QT4_WRAP_CPP(libsndfile_MOC_SRCS ${libsndfile_MOC_HDRS})
-
-
 # Don't forget to include output directory, otherwise
 # the UI file won't be wrapped!
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(SNDFILE_FOUND)
-ADD_LIBRARY(sndfile MODULE ${libsndfile_SRCS} ${libsndfile_MOC_SRCS} ${libsndfile_UIS_H}
+ADD_LIBRARY(sndfile MODULE ${libsndfile_SRCS} ${libsndfile_UIS_H}
   ${libsndfile_RCC_SRCS} ${libsndfile_HDRS})
 add_dependencies(sndfile qmmp)
 target_link_libraries(sndfile ${QT_LIBRARIES} -lqmmp ${SNDFILE_LDFLAGS})
diff --git a/src/plugins/Input/sndfile/sndfile.pro b/src/plugins/Input/sndfile/sndfile.pro
index 6aa7ed26f..c583386e5 100644
--- a/src/plugins/Input/sndfile/sndfile.pro
+++ b/src/plugins/Input/sndfile/sndfile.pro
@@ -1,7 +1,7 @@
 include(../../plugins.pri)
 
 HEADERS += decodersndfilefactory.h \
-           decoder_sndfile.h 
+           decoder_sndfile.h
 SOURCES += decoder_sndfile.cpp \
            decodersndfilefactory.cpp
 
@@ -17,23 +17,6 @@ TEMPLATE = lib
 
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/sndfile_plugin_cs.ts \
-               translations/sndfile_plugin_de.ts \
-               translations/sndfile_plugin_zh_CN.ts \
-               translations/sndfile_plugin_zh_TW.ts \
-               translations/sndfile_plugin_ru.ts \
-               translations/sndfile_plugin_pl.ts \
-               translations/sndfile_plugin_uk_UA.ts \
-               translations/sndfile_plugin_it.ts \
-               translations/sndfile_plugin_tr.ts \
-               translations/sndfile_plugin_lt.ts \
-               translations/sndfile_plugin_nl.ts \
-               translations/sndfile_plugin_ja.ts \
-               translations/sndfile_plugin_es.ts \
-               translations/sndfile_plugin_sr_BA.ts \
-               translations/sndfile_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt
index c3ae5fe4d..009decbee 100644
--- a/src/plugins/Input/vorbis/CMakeLists.txt
+++ b/src/plugins/Input/vorbis/CMakeLists.txt
@@ -44,17 +44,10 @@ SET(libvorbis_HDRS
   replaygainreader.h
 )
 
-SET(libvorbis_MOC_HDRS
-  decodervorbisfactory.h
-  vorbismetadatamodel.h
-)
-
 SET(libvorbis_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libvorbis_RCC_SRCS ${libvorbis_RCCS})
 
-QT4_WRAP_CPP(libvorbis_MOC_SRCS ${libvorbis_MOC_HDRS})
-
 # user interface
 
 QT4_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS})
@@ -63,7 +56,7 @@ QT4_WRAP_UI(libvorbis_UIS_H ${libvorbis_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(VORBIS_FOUND)
-ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_MOC_SRCS} ${libvorbis_RCC_SRCS} ${libvorbis_HDRS})
+ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_RCC_SRCS} ${libvorbis_HDRS})
 add_dependencies(vorbis qmmp)
 target_link_libraries(vorbis ${QT_LIBRARIES} -lqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS})
 install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro
index 00255ec8d..1e841171c 100644
--- a/src/plugins/Input/vorbis/vorbis.pro
+++ b/src/plugins/Input/vorbis/vorbis.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decodervorbisfactory.h \
     decoder_vorbis.h \
     vorbismetadatamodel.h \
@@ -17,23 +17,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/vorbis_plugin_ru.ts \
-    translations/vorbis_plugin_uk_UA.ts \
-    translations/vorbis_plugin_zh_CN.ts \
-    translations/vorbis_plugin_zh_TW.ts \
-    translations/vorbis_plugin_cs.ts \
-    translations/vorbis_plugin_pl.ts \
-    translations/vorbis_plugin_de.ts \
-    translations/vorbis_plugin_it.ts \
-    translations/vorbis_plugin_tr.ts \
-    translations/vorbis_plugin_lt.ts \
-    translations/vorbis_plugin_nl.ts \
-    translations/vorbis_plugin_ja.ts \
-    translations/vorbis_plugin_es.ts \
-    translations/vorbis_plugin_sr_BA.ts \
-    translations/vorbis_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt
index 2ef6f2465..55c1dc464 100644
--- a/src/plugins/Input/wavpack/CMakeLists.txt
+++ b/src/plugins/Input/wavpack/CMakeLists.txt
@@ -46,21 +46,14 @@ SET(libwavpack_HDRS
   replaygainreader.h
 )
 
-SET(libwavpack_MOC_HDRS
-  decoderwavpackfactory.h
-  wavpackmetadatamodel.h
-)
-
 SET(libwavpack_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libwavpack_RCC_SRCS ${libwavpack_RCCS})
 
-QT4_WRAP_CPP(libwavpack_MOC_SRCS ${libwavpack_MOC_HDRS})
-
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(WAVPACK_FOUND)
-ADD_LIBRARY(wavpack MODULE ${libwavpack_SRCS} ${libwavpack_MOC_SRCS} ${libwavpack_RCC_SRCS} ${libwavpack_HDRS})
+ADD_LIBRARY(wavpack MODULE ${libwavpack_SRCS} ${libwavpack_RCC_SRCS} ${libwavpack_HDRS})
 add_dependencies(wavpack qmmp)
 target_link_libraries(wavpack ${QT_LIBRARIES} -lqmmp ${WAVPACK_LDFLAGS})
 install(TARGETS wavpack DESTINATION ${LIB_DIR}/qmmp/Input)
diff --git a/src/plugins/Input/wavpack/wavpack.pro b/src/plugins/Input/wavpack/wavpack.pro
index 37d8b9f9c..b8b4b28b9 100644
--- a/src/plugins/Input/wavpack/wavpack.pro
+++ b/src/plugins/Input/wavpack/wavpack.pro
@@ -1,5 +1,5 @@
 include(../../plugins.pri)
-FORMS += 
+FORMS +=
 HEADERS += decoderwavpackfactory.h \
     decoder_wavpack.h \
     cueparser.h \
@@ -19,23 +19,6 @@ CONFIG += warn_on \
 TEMPLATE = lib
 QMAKE_LIBDIR += ../../../../lib
 
-
-TRANSLATIONS = translations/wavpack_plugin_cs.ts \
-    translations/wavpack_plugin_de.ts \
-    translations/wavpack_plugin_zh_CN.ts \
-    translations/wavpack_plugin_zh_TW.ts \
-    translations/wavpack_plugin_ru.ts \
-    translations/wavpack_plugin_pl.ts \
-    translations/wavpack_plugin_uk_UA.ts \
-    translations/wavpack_plugin_it.ts \
-    translations/wavpack_plugin_tr.ts \
-    translations/wavpack_plugin_lt.ts \
-    translations/wavpack_plugin_nl.ts \
-    translations/wavpack_plugin_ja.ts \
-    translations/wavpack_plugin_es.ts \
-    translations/wavpack_plugin_sr_BA.ts \
-    translations/wavpack_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
 
 unix {
diff --git a/src/plugins/Input/wildmidi/CMakeLists.txt b/src/plugins/Input/wildmidi/CMakeLists.txt
index a99a958fe..f24e9862f 100644
--- a/src/plugins/Input/wildmidi/CMakeLists.txt
+++ b/src/plugins/Input/wildmidi/CMakeLists.txt
@@ -40,13 +40,6 @@ SET(libwildmidi_HDRS
   decoder_wildmidi.h
 )
 
-SET(libwildmidi_MOC_HDRS
-  
-  decoderwildmidifactory.h
-  settingsdialog.h
-  wildmidihelper.h
-)
-
 # libwildmidi
 CHECK_INCLUDE_FILE(wildmidi_lib.h WILDMIDI_HEADER_FOUND)
 FIND_LIBRARY(WILDMIDI_LIB NAME WildMidi PATHS /usr/lib /usr/lib32  /usr/local/lib /usr/local/lib32)
@@ -62,8 +55,6 @@ SET(libwildmidi_RCCS translations/translations.qrc)
 
 QT4_ADD_RESOURCES(libwildmidi_RCC_SRCS ${libwildmidi_RCCS})
 
-QT4_WRAP_CPP(libwildmidi_MOC_SRCS ${libwildmidi_MOC_HDRS})
-
 # user interface
 
 
@@ -77,7 +68,7 @@ QT4_WRAP_UI(libwildmidi_UIS_H ${libwildmidi_UIS})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 IF(WILDMIDI_FOUND)
-ADD_LIBRARY(wildmidi MODULE ${libwildmidi_SRCS} ${libwildmidi_MOC_SRCS} ${libwildmidi_UIS_H} ${libwildmidi_RCC_SRCS}
+ADD_LIBRARY(wildmidi MODULE ${libwildmidi_SRCS} ${libwildmidi_UIS_H} ${libwildmidi_RCC_SRCS}
 ${libwildmidi_HDRS})
 add_dependencies(wildmidi qmmp)
 target_link_libraries(wildmidi ${QT_LIBRARIES} -lqmmp ${WILDMIDI_LIB})
diff --git a/src/plugins/Input/wildmidi/wildmidi.pro b/src/plugins/Input/wildmidi/wildmidi.pro
index 1f4819946..566489524 100644
--- a/src/plugins/Input/wildmidi/wildmidi.pro
+++ b/src/plugins/Input/wildmidi/wildmidi.pro
@@ -19,20 +19,6 @@ LIBS += -lqmmp \
     -L/usr/lib \
     -I/usr/include \
     -lWildMidi
-TRANSLATIONS = translations/wildmidi_plugin_it.ts \
-               translations/wildmidi_plugin_ru.ts \
-               translations/wildmidi_plugin_cs.ts \
-               translations/wildmidi_plugin_de.ts \
-               translations/wildmidi_plugin_zh_CN.ts \
-               translations/wildmidi_plugin_zh_TW.ts \
-               translations/wildmidi_plugin_uk_UA.ts \
-               translations/wildmidi_plugin_pl.ts \
-               translations/wildmidi_plugin_tr.ts \
-               translations/wildmidi_plugin_lt.ts \
-               translations/wildmidi_plugin_nl.ts \
-               translations/wildmidi_plugin_ja.ts \
-               translations/wildmidi_plugin_sr_BA.ts \
-               translations/wildmidi_plugin_sr_RS.ts
 
 RESOURCES = translations/translations.qrc
 isEmpty (LIB_DIR):LIB_DIR = /lib