aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2017-03-23 19:23:26 +0100
committerHanspeter Portner <dev@open-music-kontrollers.ch>2017-03-23 19:23:26 +0100
commitd72a34ad47541a8ae05f7ada266fcc013c7ee242 (patch)
tree91099215d6e22c04d0b81fcfe5b088637d0e104e
parent4c0318dce003356ebdea5055174d6cf83a6c4f58 (diff)
downloadvm.lv2-d72a34ad47541a8ae05f7ada266fcc013c7ee242.tar.xz
more gcc fixes.
-rw-r--r--VERSION2
-rw-r--r--vm.c2
-rw-r--r--vm_ui.c9
3 files changed, 6 insertions, 7 deletions
diff --git a/VERSION b/VERSION
index e0e9303..b87b43e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.2893
+0.1.2895
diff --git a/vm.c b/vm.c
index f4b3ea1..c6a74ec 100644
--- a/vm.c
+++ b/vm.c
@@ -840,7 +840,7 @@ loop: {
{
const float out1 = (handle->vm_plug == VM_PLUG_AUDIO)
? handle->out0[i] // don't clip audio
- :CLIP(VM_MIN, handle->out0[i], VM_MAX);
+ : CLIP(VM_MIN, handle->out0[i], VM_MAX);
if(*out[i] != out1)
{
diff --git a/vm_ui.c b/vm_ui.c
index 538dba5..eef85be 100644
--- a/vm_ui.c
+++ b/vm_ui.c
@@ -440,11 +440,10 @@ _expose(struct nk_context *ctx, struct nk_rect wbounds, void *data)
if(nk_group_begin(ctx, "Program", NK_WINDOW_TITLE | NK_WINDOW_BORDER))
{
- const unsigned nrow2 = 6;
- const float ratio2 [nrow2] = {
+ const float ratio2 [6] = {
0.1, 0.05, 0.05, 0.05, 0.3, 0.45
};
- nk_layout_row(ctx, NK_DYNAMIC, dy, nrow2, ratio2);
+ nk_layout_row(ctx, NK_DYNAMIC, dy, 6, ratio2);
bool sync = false;
@@ -917,10 +916,10 @@ port_event(LV2UI_Handle instance, uint32_t index, uint32_t size,
if(idx->body < 10)
{
const unsigned j = idx->body - 2;
+ handle->in0[j] = val->body;
if(handle->vm_plug == VM_PLUG_AUDIO)
{
- handle->in0[j] = val->body;
if(val->body > handle->in1[j])
handle->in1[j] = val->body;
}
@@ -928,10 +927,10 @@ port_event(LV2UI_Handle instance, uint32_t index, uint32_t size,
else
{
const unsigned j = idx->body - 10;
+ handle->out0[j] = val->body;
if(handle->vm_plug == VM_PLUG_AUDIO)
{
- handle->out0[j] = val->body;
if(val->body > handle->out1[j])
handle->out1[j] = val->body;
}