shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LV2 headers for clean build.

Browse Source
This commit is contained in:
Robin Davies
2021-08-27 18:32:12 -04:00
parent 8f5f987448
commit 6e1b7346f6
13 changed files with 96 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMakeLists.txt
+9 -2
View File
@@ -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 "$<TARGET_FILE:processcopyrights>"
--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} "$<TARGET_FILE:processcopyrights>"
COMMENT "Updating copyright notices."
src/IEffect.hpp
+1 -1
View File
@@ -19,7 +19,7 @@
#pragma once
#include <lv2/urid/urid.h>
#include <lv2/urid.lv2/urid.h>
namespace pipedal {
class RealtimeParameterRequest;
src/LogFeature.hpp
+9 -9
View File
@@ -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 <map>
#include <string>
src/Lv2Effect.cpp
+15 -15
View File
@@ -22,21 +22,21 @@
#include "PiPedalException.hpp"
#include <lv2/lv2plug.in/ns/ext/worker/worker.h>
#include <lilv/lilv.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/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;
src/Lv2Effect.hpp
+6 -6
View File
@@ -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;
src/Lv2EventBufferWriter.hpp
+4 -4
View File
@@ -41,10 +41,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdint.h>
#include <cassert>
#include <lv2/core/lv2.h>
#include <lv2/atom/atom.h>
#include <lv2/midi/midi.h>
#include <lv2/urid/urid.h>
#include <lv2/lv2core.lv2/lv2.h>
#include <lv2/atom.lv2/atom.h>
#include <lv2/midi.lv2/midi.h>
#include <lv2/urid.lv2/urid.h>
#include <cstring>
namespace pipedal
src/Lv2Host.cpp
+3 -3
View File
@@ -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"
src/Lv2Host.hpp
+1 -1
View File
@@ -31,7 +31,7 @@
#include <filesystem>
#include <cmath>
#include "lv2/core/lv2.h"
#include "lv2/lv2core.lv2/lv2.h"
#include "Units.hpp"
src/Lv2PedalBoard.hpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include "Lv2Effect.hpp"
#include "BufferPool.hpp"
#include <functional>
#include <lv2/urid/urid.h>
#include <lv2/urid.lv2/urid.h>
#include <functional>
namespace pipedal {
src/MapFeature.hpp
+8 -10
View File
@@ -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 <map>
#include <string>
#include <mutex>
@@ -68,4 +66,4 @@ namespace pipedal {
LV2_URID_Map *GetMap() { return &map;}
};
}
}
src/OptionsFeature.cpp
+14 -15
View File
@@ -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 <lv2/lv2plug.in/ns/ext/worker/worker.h>
#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;
}
}
src/Worker.hpp
+10 -10
View File
@@ -21,17 +21,17 @@
#pragma once
#include <lilv/lilv.h>
#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 <map>
#include <string>
src/pch.h
+15 -17
View File
@@ -32,24 +32,22 @@ template <typename T> class TypeDisplay;
#include <cstdlib>
#include <map>
#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 <lv2/lv2plug.in/ns/ext/worker/worker.h>
#include <lv2/lv2core.lv2/lv2.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"
*/
#define SS(x) ( ((std::stringstream&)(std::stringstream() << x )).str())