From ebd7f9bc697973366de8a6bf7265051e825e0680 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Fri, 9 Jan 2015 12:01:22 +0000
Subject: renaming experimental branch

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4675 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Input/aac/CMakeLists.txt |  9 +--------
 src/plugins/Input/aac/aac.pro        | 17 +----------------
 2 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'src/plugins/Input/aac')

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
-- 
cgit v1.2.3-13-gbd6f