diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 2270c42..75e115b 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,26 +1,30 @@ IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android") find_package(PkgConfig REQUIRED) if(PKG_CONFIG_FOUND) message(STATUS "Program pkg-config found (${PKG_CONFIG_EXECUTABLE})") else() message(FATAL_ERROR "Program pkg-config not found") endif() - pkg_check_modules(FLUIDSYNTH REQUIRED fluidsynth>=1.1.6) + pkg_check_modules(PC_FLUIDSYNTH REQUIRED fluidsynth>=1.1.6) - if(NOT FLUIDSYNTH_FOUND) + if(NOT PC_FLUIDSYNTH_FOUND) message(WARNING "Please install fluidsynth libraries and headers (package fluidsynth) if you want to build fluidsynth soundcontroller") endif() - if(FLUIDSYNTH_FOUND) - link_directories(${FLUIDSYNTH_LIBDIR}) - include_directories(${FLUIDSYNTH_INCLUDEDIR}) - endif() + if(PC_FLUIDSYNTH_FOUND) + find_library(FLUIDSYNTH_LIBRARIES + NAMES fluidsynth + HINTS ${PC_FLUIDSYNTH_LIBDIR} + ) + find_path(FLUIDSYNTH_INCLUDE_DIRS + NAMES fluidsynth.h + HINTS ${PC_FLUIDSYNTH_INCLUDEDIR} + ) - if(FLUIDSYNTH_FOUND) add_subdirectory(fluidsynthsoundcontroller) endif() ENDIF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android") IF(${CMAKE_SYSTEM_NAME} MATCHES "Android") add_subdirectory(csoundsoundcontroller) ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Android") diff --git a/src/plugins/csoundsoundcontroller/csoundsoundcontroller.json b/src/plugins/csoundsoundcontroller/csoundsoundcontroller.json index 2f9cc17..d45dbff 100644 --- a/src/plugins/csoundsoundcontroller/csoundsoundcontroller.json +++ b/src/plugins/csoundsoundcontroller/csoundsoundcontroller.json @@ -1,49 +1,50 @@ { "KPlugin": { "Category": "Sound Controllers", "Description": "This plugin provides Minuet with a CSound-based implementation of sound controller.", "Description[ca@valencia]": "Este connector proporciona el Minuet amb una implementació del dorsal de so basada en el CSound.", "Description[ca]": "Aquest connector proporciona el Minuet amb una implementació del dorsal de so basada en el CSound.", "Description[de]": "Mit diesem Modul verwendet Minuet eine auf CSound basierende Audio-Steuerung.", "Description[el]": "Αυτό το πρόσθετο παρέχει στο Μινουέτο μια εφαρμογή ελεγκτή ήχου με βάση το CSound.", "Description[es]": "Este complemento le proporciona a Minuet una implementación de controlador de sonido basada en FluidSynth.", "Description[et]": "See plugin pakub Minuetile CSoundi-põhist helikontrollerit.", "Description[fr]": "Ce module fournit à Minuet une implémentation de contrôleur audio utilisant CSound.", "Description[nl]": "Deze plug-in biedt Minuet een op CSound gebaseerde implementatie van een soundcontroller.", "Description[nn]": "Dette programtillegget gjev Minuet støtte for ein CSound-basert lydmotor.", "Description[pl]": "Ta wtyczka dostarcza Minuetowi implementację sterownika dźwięku opartą na FluidSynth", "Description[pt]": "Este 'plugin' oferece ao Minuet uma infra-estrutura de som implementada com base no CSound.", "Description[sk]": "Tento plugin poskytuje Minuet s implementáciou zvukového ovládača založeného na CSound.", "Description[sv]": "Insticksprogrammet tillhandahåller en implementering av ljudgränssnitt baserat på CSound åt Minuet.", "Description[tr]": "Bu eklenti, ses denetçisinin CSound temelli uygulaması ile birlikte Minuet sağlar.", "Description[uk]": "Цей додаток забезпечує роботу Minuet із реалізацією звукового контролера на основі CSound.", "Description[x-test]": "xxThis plugin provides Minuet with a CSound-based implementation of sound controller.xx", "Description[zh_CN]": "本插件为 Minuet 提供基于 FluidSynth 实现的声音后端。", "Description[zh_TW]": "這個外掛程式提供 Minuet 一個基於 CSound 實作的音訊控制器。", "Icon": "utilities-terminal", "Id": "minuetcsoundsoundcontroller", "Name": "CSound-based Audio Controller", "Name[ca@valencia]": "Controlador d'àudio basat en el CSound", "Name[ca]": "Controlador d'àudio basat en el CSound", "Name[de]": "Auf CSound basierende Audio-Steuerung", "Name[el]": "Ελεγκτής ήχου με βάση το CSound", "Name[es]": "Controlador de sonido basado en CSound", "Name[et]": "CSoundi-põhine helikontroller", "Name[fr]": "Contrôleur audio utilisant CSound", "Name[nl]": "Op CSound gebaseerde audiocontroller", "Name[nn]": "CSound-basert lydmotor", "Name[pl]": "Sterownik dźwięku oparty na CSound", "Name[pt]": "Controlador de Áudio Baseado no CSound", + "Name[pt_BR]": "Controlador de áudio baseado no CSound", "Name[ru]": "Звуковой контроллер на основе CSound", "Name[sk]": "Zvukový ovládač založený na CSound", "Name[sv]": "CSound-baserat ljudgränssnitt", "Name[tr]": "CSound temelli Ses Denetçisi", "Name[uk]": "Звуковий контролер на основі CSound", "Name[x-test]": "xxCSound-based Audio Controllerxx", "Name[zh_CN]": "基于 CSound 的音频控制器", "Name[zh_TW]": "基於 CSound 的音訊控制器", "ServiceTypes": [ "Minuet/Plugin" ] } } diff --git a/src/plugins/fluidsynthsoundcontroller/CMakeLists.txt b/src/plugins/fluidsynthsoundcontroller/CMakeLists.txt index c0237ef..84370a2 100644 --- a/src/plugins/fluidsynthsoundcontroller/CMakeLists.txt +++ b/src/plugins/fluidsynthsoundcontroller/CMakeLists.txt @@ -1,16 +1,18 @@ +include_directories(${FLUIDSYNTH_INCLUDE_DIRS}) + set(fluidsynthsoundcontroller_PLUGIN_SRCS fluidsynthsoundcontroller.cpp ) add_library(minuetfluidsynthsoundcontroller MODULE ${fluidsynthsoundcontroller_PLUGIN_SRCS}) target_link_libraries(minuetfluidsynthsoundcontroller Qt5::Core Minuet::Interfaces - fluidsynth + ${FLUIDSYNTH_LIBRARIES} ) IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android") install(TARGETS minuetfluidsynthsoundcontroller DESTINATION ${PLUGIN_INSTALL_DIR}/minuet/) install(FILES GeneralUser-v1.47.sf2 DESTINATION ${KDE_INSTALL_DATADIR}/minuet/soundfonts) ENDIF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android") diff --git a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.json b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.json index 4a024c2..198d0e5 100644 --- a/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.json +++ b/src/plugins/fluidsynthsoundcontroller/fluidsynthsoundcontroller.json @@ -1,49 +1,50 @@ { "KPlugin": { "Category": "Sound Controllers", "Description": "This plugin provides Minuet with a FluidSynth-based implementation of sound controller.", "Description[ca@valencia]": "Este connector proporciona el Minuet amb una implementació del dorsal de so basada en el FluidSynth.", "Description[ca]": "Aquest connector proporciona el Minuet amb una implementació del dorsal de so basada en el FluidSynth.", "Description[de]": "Mit diesem Modul verwendet Minuet eine auf FluidSynth basierende Audio-Steuerung.", "Description[el]": "Αυτό το πρόσθετο παρέχει στο Μινουέτο μια εφαρμογή ελεγκτή ήχου με βάση το FluidSynth.", "Description[es]": "Este complemento le proporciona a Minuet una implementación de controlador de sonido basada en FluidSynth.", "Description[et]": "See plugin pakub Minuetile FluidSynthi-põhist helikontrollerit.", "Description[fr]": "Ce module fournit à Minuet une implémentation de contrôleur audio utilisant FluidSynth.", "Description[nl]": "Deze plug-in biedt Minuet een op FluidSynth gebaseerde implementatie van een soundcontroller.", "Description[nn]": "Dette programtillegget gjev Minuet støtte for ein FluidSynth-basert lydmotor.", "Description[pl]": "Ta wtyczka dostarcza Minuetowi implementację sterownika dźwięku opartą na FluidSynth", "Description[pt]": "Este 'plugin' oferece ao Minuet um controlador de som implementada com base no FluidSynth.", "Description[sk]": "Tento plugin poskytuje Minuet s implementáciou zvukového ovládača založeného na FluidSynthe.", "Description[sv]": "Insticksprogrammet tillhandahåller en implementering av ljudgränssnitt baserat på FluidSynth åt Minuet.", "Description[tr]": "Bu eklenti, ses denetçisinin FluidSynth temelli uygulaması ile birlikte Minuet sağlar.", "Description[uk]": "Цей додаток забезпечує роботу Minuet із реалізацією звукового контролера на основі FluidSynth.", "Description[x-test]": "xxThis plugin provides Minuet with a FluidSynth-based implementation of sound controller.xx", "Description[zh_CN]": "本插件为 Minuet 提供基于 FluidSynth 实现的声音后端。", "Description[zh_TW]": "這個外掛程式提供 Minuet 一個基於 FluidSynth 實作的音訊控制器。", "Icon": "utilities-terminal", "Id": "minuetfluidsynthsoundcontroller", "Name": "FluidSynth-based Audio Controller", "Name[ca@valencia]": "Controlador d'àudio basat en el FluidSynth", "Name[ca]": "Controlador d'àudio basat en el FluidSynth", "Name[de]": "Auf FluidSynth basierende Audio-Steuerung", "Name[el]": "Ελεγκτής ήχου με βάση το FluidSynth", "Name[es]": "Controlador de sonido basado en FluidSynth", "Name[et]": "FluidSynthi-põhine helikontroller", "Name[fr]": "Contrôleur audio utilisant FluidSynth", "Name[nl]": "Op FluidSynth gebaseerde audiocontroller", "Name[nn]": "FluidSynth-basert lydmotor", "Name[pl]": "Sterownik dźwięku oparty na FluidSynth", "Name[pt]": "Controlador de Áudio Baseado no FluidSynth", + "Name[pt_BR]": "Controlador de áudio baseado no FluidSynth", "Name[ru]": "Звуковой контроллер на основе FluidSynth", "Name[sk]": "Zvukový ovládač založený na FluidSynthe", "Name[sv]": "FluidSynth-baserat ljudgränssnitt", "Name[tr]": "FluidSynth temelli Ses Denetçisi", "Name[uk]": "Звуковий контролер на основі FluidSynth", "Name[x-test]": "xxFluidSynth-based Audio Controllerxx", "Name[zh_CN]": "基于 FluidSynth 的音频控制器", "Name[zh_TW]": "基於 FluidSynth 的音訊控制器", "ServiceTypes": [ "Minuet/Plugin" ] } }