From 6e1b7346f66a495b7a22b5fbf6df1046a03f99c9 Mon Sep 17 00:00:00 2001 From: Robin Davies Date: Fri, 27 Aug 2021 18:32:12 -0400 Subject: [PATCH] LV2 headers for clean build. --- src/CMakeLists.txt | 11 +++++++++-- src/IEffect.hpp | 2 +- src/LogFeature.hpp | 18 +++++++++--------- src/Lv2Effect.cpp | 30 +++++++++++++++--------------- src/Lv2Effect.hpp | 12 ++++++------ src/Lv2EventBufferWriter.hpp | 8 ++++---- src/Lv2Host.cpp | 6 +++--- src/Lv2Host.hpp | 2 +- src/Lv2PedalBoard.hpp | 2 +- src/MapFeature.hpp | 18 ++++++++---------- src/OptionsFeature.cpp | 29 ++++++++++++++--------------- src/Worker.hpp | 20 ++++++++++---------- src/pch.h | 32 +++++++++++++++----------------- 13 files changed, 96 insertions(+), 94 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 51f741a..c4b847e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -36,6 +36,11 @@ else() message(STATUS "LILV_0_INCLUDE_DIRS: ${LILV_0_INCLUDE_DIRS}") endif() + +# Use LV2 headers from the /usr/lib directory. +set (LV2DEV_INCLUDE_DIRS /usr/lib) + + pkg_check_modules(JACK "jack") if(!JACK_FOUND) message(ERROR "jack package not installed.") @@ -127,7 +132,8 @@ target_precompile_headers(pipedald PRIVATE pch.h) target_include_directories(pipedald PRIVATE - ${JACK_INCLUDE_DIRS} ${LILV_0_INCLUDE_DIRS} ${LIBNL3_INCLUDE_DIRS} + ${LV2DEV_INCLUDE_DIRS} + ${JACK_INCLUDE_DIRS} ${LILV_0_INCLUDE_DIRS} ${LIBNL3_INCLUDE_DIRS} ${LVDEV_INCLUDE_DIRS} ) target_link_libraries(pipedald PRIVATE pthread atomic stdc++fs @@ -150,6 +156,7 @@ target_precompile_headers(pipedaltest PRIVATE pch.h) target_include_directories(pipedaltest PRIVATE + ${LV2DEV_INCLUDE_DIRS} ${JACK_INCLUDE_DIRS} ${LILV_0_INCLUDE_DIRS} ${LIBNL3_INCLUDE_DIRS} ) @@ -206,7 +213,7 @@ add_custom_command(OUTPUT ${REACT_NOTICES_FILE} COMMAND "$" --output ${REACT_NOTICES_FILE} --projectCopyright ${DEBIAN_COPYRIGHT_FILE} - liblilv-0-0 libboost-system1.67-dev libnl-3-dev libnl-3-dev lv2-dev + liblilv-0-0 libboost1.67-dev libnl-3-dev libnl-3-dev lv2-dev WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${DEBIAN_COPYRIGHT_FILE} "$" COMMENT "Updating copyright notices." diff --git a/src/IEffect.hpp b/src/IEffect.hpp index 0817768..d31edec 100644 --- a/src/IEffect.hpp +++ b/src/IEffect.hpp @@ -19,7 +19,7 @@ #pragma once -#include +#include namespace pipedal { class RealtimeParameterRequest; diff --git a/src/LogFeature.hpp b/src/LogFeature.hpp index 6c75f5e..9021cde 100644 --- a/src/LogFeature.hpp +++ b/src/LogFeature.hpp @@ -19,16 +19,16 @@ #pragma once -#include "lv2/core/lv2.h" +#include "lv2/lv2core.lv2/lv2.h" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/core/lv2.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/midi/midi.h" -#include "lv2/urid/urid.h" -#include "lv2/atom/atom.h" +#include "lv2/atom.lv2/atom.h" +#include "lv2/atom.lv2/util.h" +#include "lv2/lv2core.lv2/lv2.h" +#include "lv2/log.lv2/log.h" +#include "lv2/log.lv2/logger.h" +#include "lv2/midi.lv2/midi.h" +#include "lv2/urid.lv2/urid.h" +#include "lv2/atom.lv2/atom.h" #include "MapFeature.hpp" #include #include diff --git a/src/Lv2Effect.cpp b/src/Lv2Effect.cpp index bfbfc83..d194072 100644 --- a/src/Lv2Effect.cpp +++ b/src/Lv2Effect.cpp @@ -22,21 +22,21 @@ #include "PiPedalException.hpp" #include #include -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/core/lv2.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/midi/midi.h" -#include "lv2/urid/urid.h" -#include "lv2/log/logger.h" -#include "lv2/uri-map/uri-map.h" -#include "lv2/atom/forge.h" -#include "lv2/worker/worker.h" -#include "lv2/patch/patch.h" -#include "lv2/parameters/parameters.h" -#include "lv2/units/units.h" -#include "lv2/atom/util.h" +#include "lv2/atom.lv2/atom.h" +#include "lv2/atom.lv2/util.h" +#include "lv2/lv2core.lv2/lv2.h" +#include "lv2/log.lv2/log.h" +#include "lv2/log.lv2/logger.h" +#include "lv2/midi.lv2/midi.h" +#include "lv2/urid.lv2/urid.h" +#include "lv2/log.lv2/logger.h" +#include "lv2/uri-map.lv2/uri-map.h" +#include "lv2/atom.lv2/forge.h" +#include "lv2/worker.lv2/worker.h" +#include "lv2/patch.lv2/patch.h" +#include "lv2/parameters.lv2/parameters.h" +#include "lv2/units.lv2/units.h" +#include "lv2/atom.lv2/util.h" #include "JackHost.hpp" using namespace pipedal; diff --git a/src/Lv2Effect.hpp b/src/Lv2Effect.hpp index 33d996c..c03a10e 100644 --- a/src/Lv2Effect.hpp +++ b/src/Lv2Effect.hpp @@ -27,11 +27,11 @@ #include "IEffect.hpp" #include "Worker.hpp" -#include "lv2/patch/patch.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" +#include "lv2/patch.lv2/patch.h" +#include "lv2/log.lv2/log.h" +#include "lv2/log.lv2/logger.h" #include "lv2/lv2plug.in/ns/extensions/units/units.h" -#include "lv2/atom/forge.h" +#include "lv2/atom.lv2/forge.h" namespace pipedal { @@ -108,12 +108,12 @@ namespace pipedal patch_body = pHost->GetLv2Urid(LV2_PATCH__body); patch_subject = pHost->GetLv2Urid(LV2_PATCH__subject); patch_property = pHost->GetLv2Urid(LV2_PATCH__property); - patch_accept = pHost->GetLv2Urid(LV2_PATCH__accept); + //patch_accept = pHost->GetLv2Urid(LV2_PATCH__accept); patch_value = pHost->GetLv2Urid(LV2_PATCH__value); unitsFrame = pHost->GetLv2Urid(LV2_UNITS__frame); } - LV2_URID patch_accept; + //LV2_URID patch_accept; LV2_URID unitsFrame; LV2_URID pluginUri; diff --git a/src/Lv2EventBufferWriter.hpp b/src/Lv2EventBufferWriter.hpp index bf2a560..faa58b2 100644 --- a/src/Lv2EventBufferWriter.hpp +++ b/src/Lv2EventBufferWriter.hpp @@ -41,10 +41,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace pipedal diff --git a/src/Lv2Host.cpp b/src/Lv2Host.cpp index 7a7de39..9fd212e 100644 --- a/src/Lv2Host.cpp +++ b/src/Lv2Host.cpp @@ -30,9 +30,9 @@ #include "Lv2PedalBoard.hpp" #include "OptionsFeature.hpp" #include "JackConfiguration.hpp" -#include "lv2/urid/urid.h" -#include "lv2/core/lv2.h" -#include "lv2/atom/atom.h" +#include "lv2/urid.lv2/urid.h" +#include "lv2/lv2core.lv2/lv2.h" +#include "lv2/atom.lv2/atom.h" #include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h" #include "lv2/lv2plug.in/ns/ext/presets/presets.h" #include "lv2/lv2plug.in/ns/ext/port-props/port-props.h" diff --git a/src/Lv2Host.hpp b/src/Lv2Host.hpp index f51330f..4e456f6 100644 --- a/src/Lv2Host.hpp +++ b/src/Lv2Host.hpp @@ -31,7 +31,7 @@ #include #include -#include "lv2/core/lv2.h" +#include "lv2/lv2core.lv2/lv2.h" #include "Units.hpp" diff --git a/src/Lv2PedalBoard.hpp b/src/Lv2PedalBoard.hpp index 167ca1f..734043d 100644 --- a/src/Lv2PedalBoard.hpp +++ b/src/Lv2PedalBoard.hpp @@ -23,7 +23,7 @@ #include "Lv2Effect.hpp" #include "BufferPool.hpp" #include -#include +#include #include namespace pipedal { diff --git a/src/MapFeature.hpp b/src/MapFeature.hpp index d0cf403..c4dbe78 100644 --- a/src/MapFeature.hpp +++ b/src/MapFeature.hpp @@ -19,16 +19,14 @@ #pragma once -#include "lv2/core/lv2.h" +#include "lv2.h" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/core/lv2.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/midi/midi.h" -#include "lv2/urid/urid.h" -#include "lv2/atom/atom.h" +#include "lv2/lv2core.lv2/lv2.h" +#include "lv2/log.lv2/log.h" +#include "lv2/log.lv2/logger.h" +#include "lv2/midi.lv2/midi.h" +#include "lv2/urid.lv2/urid.h" +#include "lv2/atom.lv2/atom.h" #include #include #include @@ -68,4 +66,4 @@ namespace pipedal { LV2_URID_Map *GetMap() { return ↦} }; -} \ No newline at end of file +} diff --git a/src/OptionsFeature.cpp b/src/OptionsFeature.cpp index f44a3b9..a819751 100644 --- a/src/OptionsFeature.cpp +++ b/src/OptionsFeature.cpp @@ -19,20 +19,19 @@ #include "pch.h" #include "OptionsFeature.hpp" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/core/lv2_util.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/midi/midi.h" -#include "lv2/urid/urid.h" -#include "lv2/log/logger.h" -#include "lv2/uri-map/uri-map.h" -#include "lv2/atom/forge.h" -#include "lv2/worker/worker.h" -#include "lv2/patch/patch.h" -#include "lv2/parameters/parameters.h" -#include "lv2/units/units.h" +#include "lv2/atom.lv2/atom.h" +#include "lv2/atom.lv2/util.h" +#include "lv2/log.lv2/log.h" +#include "lv2/log.lv2/logger.h" +#include "lv2/midi.lv2/midi.h" +#include "lv2/urid.lv2/urid.h" +#include "lv2/log.lv2/logger.h" +#include "lv2/uri-map.lv2/uri-map.h" +#include "lv2/atom.lv2/forge.h" +#include "lv2/worker.lv2/worker.h" +#include "lv2/patch.lv2/patch.h" +#include "lv2/parameters.lv2/parameters.h" +#include "lv2/units.lv2/units.h" #include #include "lv2/lv2plug.in/ns/ext/buf-size/buf-size.h" @@ -98,4 +97,4 @@ void OptionsFeature::Prepare(MapFeature&map,double sampleRate, int32_t blockLeng options[5].type = 0; options[5].value = NULL; -} \ No newline at end of file +} diff --git a/src/Worker.hpp b/src/Worker.hpp index 13ac902..81f7f50 100644 --- a/src/Worker.hpp +++ b/src/Worker.hpp @@ -21,17 +21,17 @@ #pragma once #include -#include "lv2/core/lv2.h" +#include "lv2/lv2core.lv2/lv2.h" -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/core/lv2.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/midi/midi.h" -#include "lv2/urid/urid.h" -#include "lv2/atom/atom.h" -#include "lv2/worker/worker.h" +#include "lv2/atom.lv2/atom.h" +#include "lv2/atom.lv2/util.h" +#include "lv2/lv2core.lv2/lv2.h" +#include "lv2/log.lv2/log.h" +#include "lv2/log.lv2/logger.h" +#include "lv2/midi.lv2/midi.h" +#include "lv2/urid.lv2/urid.h" +#include "lv2/atom.lv2/atom.h" +#include "lv2/worker.lv2/worker.h" #include #include diff --git a/src/pch.h b/src/pch.h index eec150e..d5215fb 100644 --- a/src/pch.h +++ b/src/pch.h @@ -32,24 +32,22 @@ template class TypeDisplay; #include #include -#include "lv2/core/lv2.h" - /* -#include "lv2/atom/atom.h" -#include "lv2/atom/util.h" -#include "lv2/core/lv2_util.h" -#include "lv2/log/log.h" -#include "lv2/log/logger.h" -#include "lv2/midi/midi.h" -#include "lv2/urid/urid.h" -#include "lv2/log/logger.h" -#include "lv2/uri-map/uri-map.h" -#include "lv2/atom/forge.h" -#include "lv2/worker/worker.h" -#include "lv2/patch/patch.h" -#include "lv2/parameters/parameters.h" -#include "lv2/units/units.h" -#include +#include + +#include "lv2/atom.lv2/atom.h" +#include "lv2/atom.lv2/util.h" +#include "lv2/log.lv2/log.h" +#include "lv2/log.lv2/logger.h" +#include "lv2/midi.lv2/midi.h" +#include "lv2/urid.lv2/urid.h" +#include "lv2/log.lv2/logger.h" +#include "lv2/uri-map.lv2/uri-map.h" +#include "lv2/atom.lv2/forge.h" +#include "lv2/worker.lv2/worker.h" +#include "lv2/patch.lv2/patch.h" +#include "lv2/parameters.lv2/parameters.h" +#include "lv2/units.lv2/units.h" */ #define SS(x) ( ((std::stringstream&)(std::stringstream() << x )).str())