diff options
author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2019-04-06 21:38:27 +0200 |
---|---|---|
committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2019-04-06 21:38:27 +0200 |
commit | 323e9ca4d3549d63ed2dd771efd7c5c99eb2bebf (patch) | |
tree | 8d39286ba151937c1567c169bb5be50251b7f86c | |
parent | 3bd51e7f0a6493c052007754146dc6defd6040b2 (diff) | |
parent | 0f8dcb905a8bb13ac0388abb12f0ea33dbd12f45 (diff) | |
download | monitors.lv2-323e9ca4d3549d63ed2dd771efd7c5c99eb2bebf.tar.xz |
Merge commit '0f8dcb905a8bb13ac0388abb12f0ea33dbd12f45'
-rw-r--r-- | timely.lv2/VERSION | 2 | ||||
-rw-r--r-- | timely.lv2/meson.build | 19 | ||||
-rw-r--r-- | timely.lv2/test/timely.c | 3 | ||||
-rw-r--r-- | timely.lv2/timely.h | 5 |
4 files changed, 21 insertions, 8 deletions
diff --git a/timely.lv2/VERSION b/timely.lv2/VERSION index 278cbc8..6ee33ba 100644 --- a/timely.lv2/VERSION +++ b/timely.lv2/VERSION @@ -1 +1 @@ -0.1.43 +0.1.45 diff --git a/timely.lv2/meson.build b/timely.lv2/meson.build index 9b0dd0a..4dbff9d 100644 --- a/timely.lv2/meson.build +++ b/timely.lv2/meson.build @@ -1,6 +1,6 @@ project('timely.lv2', 'c', default_options : [ 'buildtype=release', - 'warning_level=1', + 'warning_level=3', 'werror=false', 'b_lto=false', 'c_std=c11']) @@ -11,6 +11,8 @@ conf_data = configuration_data() cc = meson.get_compiler('c') cp = find_program('cp') +lv2_validate = find_program('lv2_validate', native : true, required : false) +lv2lint = find_program('lv2lint', required : false) clone = [cp, '@INPUT@', '@OUTPUT@'] m_dep = cc.find_library('m') @@ -41,13 +43,24 @@ conf_data.set('MICRO_VERSION', version[2]) suffix = mod.full_path().strip().split('.')[-1] conf_data.set('MODULE_SUFFIX', '.' + suffix) -configure_file(input : join_paths('test', 'manifest.ttl.in'), output : 'manifest.ttl', +manifest_ttl = configure_file(input : join_paths('test', 'manifest.ttl.in'), output : 'manifest.ttl', configuration : conf_data, install : true, install_dir : inst_dir) -custom_target('timely_ttl', +dsp_ttl = custom_target('timely_ttl', input : join_paths('test', 'timely.ttl'), output : 'timely.ttl', command : clone, install : true, install_dir : inst_dir) + +if lv2_validate.found() + test('LV2 validate', lv2_validate, + args : [manifest_ttl, dsp_ttl]) +endif + +if lv2lint.found() + test('LV2 lint', lv2lint, + args : ['-Ewarn', + 'http://open-music-kontrollers.ch/lv2/timely#test']) +endif diff --git a/timely.lv2/test/timely.c b/timely.lv2/test/timely.c index ce442b0..ba2d63a 100644 --- a/timely.lv2/test/timely.c +++ b/timely.lv2/test/timely.c @@ -99,7 +99,8 @@ _timely_cb(timely_t *timely, int64_t frames, LV2_URID type, void *data) static LV2_Handle instantiate(const LV2_Descriptor* descriptor, double rate, - const char *bundle_path, const LV2_Feature *const *features) + const char *bundle_path __attribute__((unused)), + const LV2_Feature *const *features) { plughandle_t *handle = calloc(1, sizeof(plughandle_t)); if(!handle) diff --git a/timely.lv2/timely.h b/timely.lv2/timely.h index 7dd00ee..ed9497b 100644 --- a/timely.lv2/timely.h +++ b/timely.lv2/timely.h @@ -26,12 +26,11 @@ #include <lv2/lv2plug.in/ns/ext/atom/forge.h> #include <lv2/lv2plug.in/ns/ext/time/time.h> -typedef enum _timely_mask_t timely_mask_t; typedef struct _timely_t timely_t; typedef void (*timely_cb_t)(timely_t *timely, int64_t frames, LV2_URID type, void *data); -enum _timely_mask_t { +typedef enum _timely_mask_t { TIMELY_MASK_BAR_BEAT = (1 << 0), TIMELY_MASK_BAR = (1 << 1), TIMELY_MASK_BEAT_UNIT = (1 << 2), @@ -42,7 +41,7 @@ enum _timely_mask_t { TIMELY_MASK_SPEED = (1 << 7), TIMELY_MASK_BAR_BEAT_WHOLE = (1 << 8), TIMELY_MASK_BAR_WHOLE = (1 << 9) -}; +} timely_mask_t; struct _timely_t { struct { |