From 451d48e73e77f08fe49bae10229df62887e04166 Mon Sep 17 00:00:00 2001 From: Stefan Nussbaumer Date: Thu, 12 Nov 2015 22:40:20 +0100 Subject: [PATCH] adopt fix for NodeProxy:-set from original Conductor repo various small fixes Signed-off-by: --- CVCenter/CVWidget.sc | 5 +++-- CVCenter/CVWidgetMSEditor.sc | 14 -------------- CVCenter/CVWidgetSpecsEditor.sc | 2 +- CVCenter/extObject.sc | 2 +- Conductor | 2 +- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/CVCenter/CVWidget.sc b/CVCenter/CVWidget.sc index 435553b..3974a7f 100644 --- a/CVCenter/CVWidget.sc +++ b/CVCenter/CVWidget.sc @@ -2923,8 +2923,9 @@ CVWidget { this.oscReplyPort !? { addr.port_(this.oscReplyPort) }; midiOscEnv.oscReplyAddrs ?? { midiOscEnv.oscReplyAddrs = [] }; if(midiOscEnv.oscReplyAddrs.includesEqual(addr).not, { - midiOscEnv.oscReplyAddrs = midiOscEnv.oscReplyAddrs.add(addr); - midiOscEnv.oscReplyAddrs = midiOscEnv.oscReplyAddrs.asBag.contents.keys.asArray; + midiOscEnv.oscReplyAddrs = midiOscEnv.oscReplyAddrs.add(addr).asSet.asArray; + // midiOscEnv.oscReplyAddrs = midiOscEnv.oscReplyAddrs.asBag.contents.keys.asArray; + // midiOscEnv.oscReplyAddrs.postln; }); if(thisCalib, { if(midiOscEnv.calibConstraints.isNil, { diff --git a/CVCenter/CVWidgetMSEditor.sc b/CVCenter/CVWidgetMSEditor.sc index c1a515c..da230a3 100644 --- a/CVCenter/CVWidgetMSEditor.sc +++ b/CVCenter/CVWidgetMSEditor.sc @@ -1508,20 +1508,6 @@ CVWidgetMSEditor : AbstractCVWidgetEditor { }); flow3.top_(flow3.top-76); - // if(actionsUIs[name].actionView.bounds.top > 256, { - // tabView3.bounds_(Point( - // tabView3.bounds.width, - // actionsUIs[name].actionView.bounds.top-26 - // )) - // }, { - // tabView3.bounds_(Point( - // tabView3.bounds.width, - // 230 - // )) - // }); - // - // cTabView3.bounds_(tabView3.bounds); - } ) diff --git a/CVCenter/CVWidgetSpecsEditor.sc b/CVCenter/CVWidgetSpecsEditor.sc index b435f05..48ab677 100644 --- a/CVCenter/CVWidgetSpecsEditor.sc +++ b/CVCenter/CVWidgetSpecsEditor.sc @@ -1,4 +1,4 @@ -/* (c) 2010-2012 Stefan Nussbaumer */ +/* (c) Stefan Nussbaumer */ /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/CVCenter/extObject.sc b/CVCenter/extObject.sc index 297cd38..a48e4d4 100644 --- a/CVCenter/extObject.sc +++ b/CVCenter/extObject.sc @@ -1,4 +1,4 @@ -/* (c) 2010-2013 Stefan Nussbaumer */ +/* (c) Stefan Nussbaumer */ /* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/Conductor b/Conductor index fb59570..ac19f01 160000 --- a/Conductor +++ b/Conductor @@ -1 +1 @@ -Subproject commit fb595705fc4c6e414627346dd5d6eb6adc6e2f12 +Subproject commit ac19f01530a28502054713fdce2f20b5938ad514