updated cmake files and documentation

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

4 files changed, 19 insertions, 1 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71cbd128c..52877636f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,6 +245,7 @@ MESSAGE("Advanced:")
 PRINT_SUMMARY ("Skinned user interface ................" USE_SKINNED X11_FOUND AND Qt5X11Extras_FOUND)
 PRINT_SUMMARY ("Simple user interface (QSUI) .........." USE_QSUI 1)
 PRINT_SUMMARY ("Automatic charset detection ..........." USE_ENCA ENCA_FOUND)
+PRINT_SUMMARY ("MPEG plugin with LibRCD support ......." USE_LIBRCD LIBRCD_FOUND)
 PRINT_SUMMARY ("Directory association ................." USE_DIR_ASSOC 1)
 PRINT_SUMMARY ("Set RPATH in installed binaries ......." CMAKE_INSTALL_RPATH_USE_LINK_PATH 1)
 IF(MPEG_DECODERS)
diff --git a/README b/README
index 99d3a37d1..81b231644 100644
--- a/README
+++ b/README
@@ -113,6 +113,7 @@ Requirements:
 - libshout (optional)
 - mplayer (optional)
 - libx11, libxcb, xorgproto (optional)
+- librcd >= 0.1.13 (optional)
 - cmake >= 3.5.0 (for build only)
 
 Attention! Qmmp build needs lrelease installed.
@@ -146,6 +147,7 @@ Available options:
 - USE_SKINNED (standard skinned UI);
 - USE_QSUI (simple UI);
 - USE_DIR_ASSOC (inode/directory mime type association);
+- USE_LIBRCD (using LibRCD library for charset detection of ID3v1/v2 tags, disabled by default);
 - QMMP_DEFAULT_OUTPUT (default output plugin, example: -DQMMP_DEFAULT_OUTPUT=pulse);
 - QMMP_DEFAULT_UI (default user interface, example: -DQMMP_DEFAULT_UI=qsui).
 
diff --git a/README.RUS b/README.RUS
index e81a051c9..52b99b015 100644
--- a/README.RUS
+++ b/README.RUS
@@ -112,6 +112,7 @@ Qmmp - Qt-based multimedia player
 - libshout (опционально)
 - mplayer (опционально)
 - libx11, libxcb, xorgproto (опционально)
+- librcd >= 0.1.13 (опционально)
 - cmake >= 3.5.0 (только для сборки)
 
 Внимание! Для сборки Qmmp нужна утилита lrelease.
@@ -144,6 +145,7 @@ cmake ./ -DUSE_JACK:BOOL=FALSE
 - USE_SKINNED (стандартный пользовательский интерфейс);
 - USE_QSUI (простой интерфейс);
 - USE_DIR_ASSOC (привязка к mime-типу inode/directory);
+- USE_LIBRCD (использование библиотеки LibRCD для определения кодировок ID3v1/v2-тегов, по умолчанию отключено);
 - QMMP_DEFAULT_OUTPUT (модуль вывода по умолчанию, пример использования: -DQMMP_DEFAULT_OUTPUT=pulse);
 - QMMP_DEFAULT_UI (интерфейс пользователя по умолчанию, пример использования: -DQMMP_DEFAULT_UI=qsui).
 
diff --git a/src/plugins/Input/mpeg/CMakeLists.txt b/src/plugins/Input/mpeg/CMakeLists.txt
index 9ff7cd01c..1d3fd8067 100644
--- a/src/plugins/Input/mpeg/CMakeLists.txt
+++ b/src/plugins/Input/mpeg/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(libmpeg)
 
+INCLUDE(CheckIncludeFileCXX)
+
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 # libqmmp
@@ -20,6 +22,17 @@ include_directories(${TAGLIB_INCLUDE_DIRS})
 link_directories(${TAGLIB_LIBRARY_DIRS})
 ADD_DEFINITIONS(${TAGLIB_CFLAGS})
 
+SET(USE_LIBRCD FALSE CACHE BOOL "enable/disable charset detection for ID3v1/2 tags using librcd")
+
+IF(USE_LIBRCD)
+  CHECK_INCLUDE_FILE_CXX(mpc/mpcdec.h LIBRCD_HEADER_FOUND)
+ENDIF(USE_LIBRCD)
+
+IF(LIBRCD_HEADER_FOUND)
+  SET(LIBRCD_FOUND TRUE CACHE INTERNAL "rcd")
+  SET(LIBRCD_LDFLAGS -lrcd)
+ENDIF(LIBRCD_HEADER_FOUND)
+
 
 SET(libmpeg_SRCS
   decodermpegfactory.cpp
@@ -66,6 +79,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 IF(MAD_FOUND OR MPG123_FOUND)
 ADD_LIBRARY(mpeg MODULE ${libmpeg_SRCS} ${libmpeg_UIS_H} ${libmpeg_RCC_SRCS} ${libmpeg_HDRS})
 add_dependencies(mpeg libqmmp)
-target_link_libraries(mpeg Qt5::Widgets libqmmp ${TAGLIB_LDFLAGS} ${MAD_LDFLAGS} ${MPG123_LDFLAGS})
+target_link_libraries(mpeg Qt5::Widgets libqmmp ${TAGLIB_LDFLAGS} ${MAD_LDFLAGS} ${MPG123_LDFLAGS} ${LIBRCD_LDFLAGS})
 install(TARGETS mpeg DESTINATION ${PLUGIN_DIR}/Input)
 ENDIF(MAD_FOUND OR MPG123_FOUND)