aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2019-04-03 21:59:37 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2019-04-03 21:59:37 +0200
commit305fbe32aff8b5cf240ed2a6882e1dd2b1ce1477 (patch)
tree31d4a673dc85c1409d8daa4d0e4f84b31b7fa166
parent4fd093de3ffdafd561cbc371f8761fa7c02e00fc (diff)
downloadtracker.lv2-305fbe32aff8b5cf240ed2a6882e1dd2b1ce1477.zip
tracker.lv2-305fbe32aff8b5cf240ed2a6882e1dd2b1ce1477.tar.gz
tracker.lv2-305fbe32aff8b5cf240ed2a6882e1dd2b1ce1477.tar.bz2
tracker.lv2-305fbe32aff8b5cf240ed2a6882e1dd2b1ce1477.tar.xz
Squashed 'props.lv2/' changes from 333d4a1..9d80261
9d80261 reintroduce _props_impl_get. git-subtree-dir: props.lv2 git-subtree-split: 9d80261ce9cc8a3d42ca573d68af15631d867eed
-rw-r--r--VERSION2
-rw-r--r--meson.build2
-rw-r--r--props.h16
-rw-r--r--test/props.c10
4 files changed, 16 insertions, 14 deletions
diff --git a/VERSION b/VERSION
index 7240082..8b06068 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.115
+0.1.117
diff --git a/meson.build b/meson.build
index abd5cd1..176a8bb 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('props.lv2', 'c', default_options : [
'buildtype=release',
- 'warning_level=1',
+ 'warning_level=3',
'werror=false',
'b_lto=false',
'c_std=c11'])
diff --git a/props.h b/props.h
index ff05ff8..06fec13 100644
--- a/props.h
+++ b/props.h
@@ -263,7 +263,7 @@ _props_qsort(props_impl_t *A, int n)
}
static inline props_impl_t *
-_props_bsearch(props_t *props, LV2_URID property)
+_props_impl_get(props_t *props, LV2_URID property)
{
props_impl_t *base = props->impls;
@@ -668,7 +668,7 @@ props_advance(props_t *props, LV2_Atom_Forge *forge, uint32_t frames,
}
else if(property->atom.type == props->urid.atom_urid)
{
- props_impl_t *impl = _props_bsearch(props, property->body);
+ props_impl_t *impl = _props_impl_get(props, property->body);
if(impl)
{
@@ -728,7 +728,7 @@ props_advance(props_t *props, LV2_Atom_Forge *forge, uint32_t frames,
return 0;
}
- props_impl_t *impl = _props_bsearch(props, property->body);
+ props_impl_t *impl = _props_impl_get(props, property->body);
if(impl && (impl->access == props->urid.patch_writable) )
{
_props_impl_set(props, impl, value->type, value->size,
@@ -794,7 +794,7 @@ props_advance(props_t *props, LV2_Atom_Forge *forge, uint32_t frames,
const LV2_URID property = prop->key;
const LV2_Atom *value = &prop->value;
- props_impl_t *impl = _props_bsearch(props, property);
+ props_impl_t *impl = _props_impl_get(props, property);
if(impl && (impl->access == props->urid.patch_writable) )
{
_props_impl_set(props, impl, value->type, value->size,
@@ -822,7 +822,7 @@ static inline void
props_set(props_t *props, LV2_Atom_Forge *forge, uint32_t frames,
LV2_URID property, LV2_Atom_Forge_Ref *ref)
{
- props_impl_t *impl = _props_bsearch(props, property);
+ props_impl_t *impl = _props_impl_get(props, property);
if(impl)
{
@@ -837,7 +837,7 @@ static inline void
props_get(props_t *props, LV2_Atom_Forge *forge, uint32_t frames,
LV2_URID property, LV2_Atom_Forge_Ref *ref)
{
- props_impl_t *impl = _props_bsearch(props, property);
+ props_impl_t *impl = _props_impl_get(props, property);
if(impl)
{
@@ -849,7 +849,7 @@ props_get(props_t *props, LV2_Atom_Forge *forge, uint32_t frames,
static inline void
props_stash(props_t *props, LV2_URID property)
{
- props_impl_t *impl = _props_bsearch(props, property);
+ props_impl_t *impl = _props_impl_get(props, property);
if(impl)
_props_impl_stash(props, impl);
@@ -872,7 +872,7 @@ props_map(props_t *props, const char *uri)
static inline const char *
props_unmap(props_t *props, LV2_URID property)
{
- props_impl_t *impl = _props_bsearch(props, property);
+ props_impl_t *impl = _props_impl_get(props, property);
if(impl)
return impl->def->property;
diff --git a/test/props.c b/test/props.c
index edeac6a..590c519 100644
--- a/test/props.c
+++ b/test/props.c
@@ -62,7 +62,7 @@ struct _plughandle_t {
};
static void
-_intercept(void *data, int64_t frames, props_impl_t *impl)
+_intercept(void *data, int64_t frames __attribute__((unused)), props_impl_t *impl)
{
plughandle_t *handle = data;
@@ -159,8 +159,10 @@ static const props_def_t defs [MAX_NPROPS] = {
};
static LV2_Handle
-instantiate(const LV2_Descriptor* descriptor, double rate,
- const char *bundle_path, const LV2_Feature *const *features)
+instantiate(const LV2_Descriptor* descriptor,
+ double rate __attribute__((unused)),
+ const char *bundle_path __attribute__((unused)),
+ const LV2_Feature *const *features)
{
plughandle_t *handle = calloc(1, sizeof(plughandle_t));
if(!handle)
@@ -226,7 +228,7 @@ connect_port(LV2_Handle instance, uint32_t port, void *data)
}
static void
-run(LV2_Handle instance, uint32_t nsamples)
+run(LV2_Handle instance, uint32_t nsamples __attribute__((unused)))
{
plughandle_t *handle = instance;