diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2017-05-21 09:41:10 +0200 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2017-05-21 09:41:10 +0200 |
| commit | 0f2954ac0278ce6e5ea95b9d42bdb98736415eb6 (patch) | |
| tree | 1ae33e594de19d11ec8a92cd4b6097eed679741d /include | |
| parent | c50abfff6b7ae8b93c990681ee9df50cefd92330 (diff) | |
| download | synthpod-0f2954ac0278ce6e5ea95b9d42bdb98736415eb6.tar.xz | |
prototype automatic UI loading.
* re-add -g/-G command line arguments.
* if started with UI, closing UI closes app, too.
Diffstat (limited to 'include')
| -rw-r--r-- | include/synthpod_common.h | 8 | ||||
| -rw-r--r-- | include/synthpod_private.h | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/include/synthpod_common.h b/include/synthpod_common.h index 2523859d..bdb32431 100644 --- a/include/synthpod_common.h +++ b/include/synthpod_common.h @@ -18,6 +18,7 @@ #ifndef _SYNTHPOD_COMMON_H #define _SYNTHPOD_COMMON_H +#include <stdio.h> #include <sys/types.h> #include <sys/stat.h> #include <err.h> @@ -25,11 +26,14 @@ #include <string.h> #include <ftw.h> -#define SYNTHPOD_PREFIX "http://open-music-kontrollers.ch/lv2/synthpod#" +#define SYNTHPOD_PREFIX "http://open-music-kontrollers.ch/lv2/synthpod#" + +#define SYNTHPOD_STEREO_URI SYNTHPOD_PREFIX"stereo" +#define SYNTHPOD_COMMON_NK_URI SYNTHPOD_PREFIX"common_4_nk" +#define SYNTHPOD_ROOT_NK_URI SYNTHPOD_PREFIX"root_4_nk" #ifdef _WIN32 # define SYNTHPOD_SYMBOL_EXTERN __declspec(dllexport) -# include <Evil.h> # define mlock(...) # define munlock(...) #else diff --git a/include/synthpod_private.h b/include/synthpod_private.h index fc1ea85d..df03dea4 100644 --- a/include/synthpod_private.h +++ b/include/synthpod_private.h @@ -18,9 +18,7 @@ #ifndef _SYNTHPOD_PRIVATE_H #define _SYNTHPOD_PRIVATE_H -#define SYNTHPOD_PREFIX "http://open-music-kontrollers.ch/lv2/synthpod#" #define SYNTHPOD_WORLD SYNTHPOD_PREFIX"world" -#define LV2_UI__EoUI LV2_UI_PREFIX"EoUI" #if defined(HAS_BUILTIN_ASSUME_ALIGNED) # define ASSUME_ALIGNED(PTR) __builtin_assume_aligned((PTR), 8) @@ -165,7 +163,6 @@ struct _reg_t { } log; struct { - reg_item_t eo; reg_item_t window_title; reg_item_t show_interface; reg_item_t idle_interface; @@ -452,7 +449,6 @@ sp_regs_init(reg_t *regs, LilvWorld *world, LV2_URID_Map *map) _register(®s->log.trace, world, map, LV2_LOG__Trace); _register(®s->log.warning, world, map, LV2_LOG__Warning); - _register(®s->ui.eo, world, map, LV2_UI__EoUI); _register(®s->ui.window_title, world, map, LV2_UI__windowTitle); _register(®s->ui.show_interface, world, map, LV2_UI__showInterface); _register(®s->ui.idle_interface, world, map, LV2_UI__idleInterface); @@ -694,7 +690,6 @@ sp_regs_deinit(reg_t *regs) _unregister(®s->log.trace); _unregister(®s->log.warning); - _unregister(®s->ui.eo); _unregister(®s->ui.window_title); _unregister(®s->ui.show_interface); _unregister(®s->ui.idle_interface); |