From c533e3105c11a4f4eca60eae23f60fd00f61859c Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 16 Apr 2012 00:04:19 +0100 Subject: [PATCH] Fix build --- src/carla-includes/lv2/state.h | 2 +- src/carla-includes/lv2/ui.h | 2 +- src/carla.py | 2 -- src/carla/lv2.cpp | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/carla-includes/lv2/state.h b/src/carla-includes/lv2/state.h index 44e19cb..4fc8eb7 100644 --- a/src/carla-includes/lv2/state.h +++ b/src/carla-includes/lv2/state.h @@ -26,7 +26,7 @@ #include #include -#include "lv2/lv2plug.in/ns/lv2core/lv2.h" +#include "lv2.h" #define LV2_STATE_URI "http://lv2plug.in/ns/ext/state" #define LV2_STATE_PREFIX LV2_STATE_URI "#" diff --git a/src/carla-includes/lv2/ui.h b/src/carla-includes/lv2/ui.h index 6dcb8e4..efe4eaf 100644 --- a/src/carla-includes/lv2/ui.h +++ b/src/carla-includes/lv2/ui.h @@ -26,7 +26,7 @@ #include -#include "lv2/lv2plug.in/ns/lv2core/lv2.h" +#include "lv2.h" #define LV2_UI_URI "http://lv2plug.in/ns/extensions/ui" #define LV2_UI_PREFIX LV2_UI_URI "#" diff --git a/src/carla.py b/src/carla.py index c6deb1f..10fe1e8 100755 --- a/src/carla.py +++ b/src/carla.py @@ -100,10 +100,8 @@ def CustomDataType2String(dtype): elif (dtype == CUSTOM_DATA_FLOAT): return "float" elif (dtype == CUSTOM_DATA_STRING): - print("Carla requiested type save - string", dtype) return "string" elif (dtype == CUSTOM_DATA_BINARY): - print("Carla requiested type save - binary", dtype) return "binary" else: return "null" diff --git a/src/carla/lv2.cpp b/src/carla/lv2.cpp index 90786ce..74811e2 100644 --- a/src/carla/lv2.cpp +++ b/src/carla/lv2.cpp @@ -1986,7 +1986,7 @@ public: for (i=0; i < rdf_descriptor->PortCount; i++) { LV2_Property PortType = rdf_descriptor->Ports[i].Type; - if (bool(LV2_IS_PORT_AUDIO(PortType) || LV2_IS_PORT_CONTROL(PortType) || LV2_IS_PORT_EVENT(PortType) || LV2_IS_PORT_MIDI_LL(PortType)) == false) + if (bool(LV2_IS_PORT_AUDIO(PortType) || LV2_IS_PORT_CONTROL(PortType) || LV2_IS_PORT_ATOM_SEQUENCE(PortType) || LV2_IS_PORT_EVENT(PortType) || LV2_IS_PORT_MIDI_LL(PortType)) == false) { qCritical("Got unsupported port -> %i", PortType); if (! LV2_IS_PORT_OPTIONAL(rdf_descriptor->Ports[i].Properties))