aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt1
-rw-r--r--api/api.c2
-rw-r--r--include/moony.h11
3 files changed, 2 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4482862..f695ee0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ include_directories(${PROJECT_SOURCE_DIR}/tlsf-3.0)
include_directories(${PROJECT_SOURCE_DIR}/eo_ui.lv2)
include_directories(${PROJECT_SOURCE_DIR}/osc.lv2)
include_directories(${PROJECT_SOURCE_DIR}/timely.lv2)
+include_directories(${PROJECT_SOURCE_DIR}/xpress.lv2)
include_directories(${PROJECT_SOURCE_DIR}/lua-5.3.1)
include_directories(${PROJECT_SOURCE_DIR}/http-parser)
include_directories(${PROJECT_SOURCE_DIR}/cJSON)
diff --git a/api/api.c b/api/api.c
index 29cd7db..b3110b6 100644
--- a/api/api.c
+++ b/api/api.c
@@ -28,11 +28,9 @@
#include <api_time.h>
#include <api_state.h>
-#define XPRESS_PREFIX "http://open-music-kontrollers.ch/lv2/xpress#"
#define RDF_PREFIX "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
#define RDFS_PREFIX "http://www.w3.org/2000/01/rdf-schema#"
-#define XPRESS_VOICE_MAP XPRESS_PREFIX"voiceMap"
#define RDF__value RDF_PREFIX"value"
#define RDFS__label RDFS_PREFIX"label"
#define RDFS__range RDFS_PREFIX"range"
diff --git a/include/moony.h b/include/moony.h
index a4a7d2e..21de613 100644
--- a/include/moony.h
+++ b/include/moony.h
@@ -42,6 +42,7 @@
#include <api_vm.h>
#include <lv2_osc.h>
+#include <xpress.h>
#include <lua.h>
#include <lauxlib.h>
@@ -103,16 +104,6 @@ extern const LV2UI_Descriptor simple_kx;
extern const LV2UI_Descriptor web_ui;
extern const LV2UI_Descriptor web_kx;
-// xpress:voiceMap
-typedef int64_t xpress_uuid_t;
-typedef struct _xpress_map_t xpress_map_t;
-typedef xpress_uuid_t (*xpress_map_new_uuid_t)(void *handle);
-
-struct _xpress_map_t {
- void *handle;
- xpress_map_new_uuid_t new_uuid;
-};
-
typedef enum _moony_udata_t {
MOONY_UDATA_ATOM,
MOONY_UDATA_FORGE,