adopt fix for NodeProxy:-set from original Conductor repo

various small fixes Signed-off-by: <st9fan@gmail.com>
nuss · Nov 12, 2015 · 451d48e · 451d48e
1 parent eb5e964
commit 451d48e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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