Vector Object Revisions part 1

AlexHarker · AlexHarker · commit ecab2389a0d4 · 2017-10-11T22:55:12.000+01:00
diff --git a/FrameLib_Objects/Vector/FrameLib_Chop.cpp b/FrameLib_Objects/Vector/FrameLib_Chop.cpp
@@ -5,7 +5,7 @@
 
 FrameLib_Chop::FrameLib_Chop(FrameLib_Context context, FrameLib_Parameters::Serial *serialisedParameters, void *owner): FrameLib_Processor(context, owner, &sParamInfo)
 {
-    mParameters.addInt(kNumOuts, "numouts", 1, 0);
+    mParameters.addInt(kNumOuts, "num_outs", 1, 0);
     mParameters.setClip(2, 32);
     mParameters.setInstantiation();
     
@@ -21,6 +21,8 @@ FrameLib_Chop::FrameLib_Chop(FrameLib_Context context, FrameLib_Parameters::Seri
     mNumOuts = mParameters.getInt(kNumOuts);
     
     setIO(1, mNumOuts);
+    
+    addParameterInput();
 }
 
 // Info
diff --git a/FrameLib_Objects/Vector/FrameLib_Join.cpp b/FrameLib_Objects/Vector/FrameLib_Join.cpp
@@ -5,13 +5,13 @@
 
 FrameLib_Join::FrameLib_Join(FrameLib_Context context, FrameLib_Parameters::Serial *serialisedParameters, void *owner) : FrameLib_Processor(context, owner, &sParamInfo)
 {
-    mParameters.addInt(kNumIns, "numins", 2, 0);
+    mParameters.addInt(kNumIns, "num_ins", 2, 0);
     mParameters.setClip(2, 32);
     mParameters.setInstantiation();
     
     mParameters.set(serialisedParameters);
 
-    mParameters.addBoolArray(kTriggers, "triggers", 1.0, mParameters.getInt(kNumIns));
+    mParameters.addBoolArray(kTriggers, "trigger_ins", 1.0, mParameters.getInt(kNumIns));
     mParameters.setInstantiation();
     
     mParameters.set(serialisedParameters);
diff --git a/FrameLib_Objects/Vector/FrameLib_Join.h b/FrameLib_Objects/Vector/FrameLib_Join.h
@@ -4,7 +4,7 @@
 
 #include "FrameLib_DSP.h"
 
-// FIX - time variable triggers
+// FIX - time variable triggers?
 
 class FrameLib_Join : public FrameLib_Processor
 {
diff --git a/FrameLib_Objects/Vector/FrameLib_MedianFilter.cpp b/FrameLib_Objects/Vector/FrameLib_MedianFilter.cpp
@@ -5,12 +5,12 @@
 
 // Constructor
 
-FrameLib_MedianFilter::FrameLib_MedianFilter(FrameLib_Context context, FrameLib_Parameters::Serial *serialisedParameters, void *owner) : FrameLib_Processor(context, owner, &sParamInfo, 2, 1)
+FrameLib_MedianFilter::FrameLib_MedianFilter(FrameLib_Context context, FrameLib_Parameters::Serial *serialisedParameters, void *owner) : FrameLib_Processor(context, owner, &sParamInfo, 1, 1)
 {
     mParameters.addInt(kWidth, "width", 1, 0);
     mParameters.setMin(1);
     
-    mParameters.addDouble(kPadding, "padding", 0.0, 1);
+    mParameters.addDouble(kPadding, "pad", 0.0, 1);
     
     mParameters.addEnum(kMode, "mode", 3);
     mParameters.addEnumItem(kPad, "pad");
@@ -19,7 +19,7 @@ FrameLib_MedianFilter::FrameLib_MedianFilter(FrameLib_Context context, FrameLib_
     
     mParameters.set(serialisedParameters);
     
-    setParameterInput(1);
+    addParameterInput();
 }
 
 // Info
diff --git a/FrameLib_Objects/Vector/FrameLib_Pad.cpp b/FrameLib_Objects/Vector/FrameLib_Pad.cpp
@@ -5,7 +5,7 @@
 
 FrameLib_Pad::FrameLib_Pad(FrameLib_Context context, FrameLib_Parameters::Serial *serialisedParameters, void *owner) : FrameLib_Processor(context, owner, &sParamInfo, 1, 1)
 {
-    mParameters.addDouble(kPadding, "padding", 0.0, 0);
+    mParameters.addDouble(kPadding, "pad", 0.0, 0);
     
     mParameters.addDouble(kStart, "start", 0.0, 1);
     mParameters.setMin(0.0);
@@ -18,6 +18,8 @@ FrameLib_Pad::FrameLib_Pad(FrameLib_Context context, FrameLib_Parameters::Serial
     mParameters.addEnumItem(kRatio, "ratios");
     
     mParameters.set(serialisedParameters);
+    
+    addParameterInput();
 }
 
 // Info
@@ -54,7 +56,7 @@ FrameLib_Pad::ParameterInfo::ParameterInfo()
 
 // Process
 
-void FrameLib_Pad::process ()
+void FrameLib_Pad::process()
 {
     // Get Input
     
diff --git a/FrameLib_Objects/Vector/FrameLib_Percentile.cpp b/FrameLib_Objects/Vector/FrameLib_Percentile.cpp
@@ -11,7 +11,7 @@ FrameLib_Percentile::FrameLib_Percentile(FrameLib_Context context, FrameLib_Para
     
     mParameters.set(serialisedParameters);
     
-    mPercentile = mParameters.getValue(kPercentile);
+    addParameterInput();
 }
 
 // Info
@@ -64,7 +64,7 @@ void FrameLib_Percentile::process()
         
         // Linearly interpolate output
         
-        double position = (mPercentile * (sizeIn - 1) / 100.0);
+        double position = (mParameters.getValue(kPercentile) * (sizeIn - 1) / 100.0);
         unsigned long idx = position;
         double fract = position - idx;
         
diff --git a/FrameLib_Objects/Vector/FrameLib_Percentile.h b/FrameLib_Objects/Vector/FrameLib_Percentile.h
@@ -31,10 +31,8 @@ class FrameLib_Percentile : public FrameLib_Processor
     void process();
     
     // Data
-
-    double mPercentile;
     
     static ParameterInfo sParamInfo;
 };
 
-#endif
+#endif
diff --git a/FrameLib_Objects/Vector/FrameLib_Shift.cpp b/FrameLib_Objects/Vector/FrameLib_Shift.cpp
@@ -7,7 +7,7 @@ FrameLib_Shift::FrameLib_Shift(FrameLib_Context context, FrameLib_Parameters::Se
 {
     mParameters.addDouble(kShift, "shift", 0.0, 0);
     
-    mParameters.addDouble(kPadding, "padding", 0.0, 1);
+    mParameters.addDouble(kPadding, "pad", 0.0, 1);
     
     mParameters.addEnum(kMode, "mode", 2);
     mParameters.addEnumItem(kPad, "pad");
@@ -18,6 +18,8 @@ FrameLib_Shift::FrameLib_Shift(FrameLib_Context context, FrameLib_Parameters::Se
     mParameters.addEnumItem(kRatio, "ratios");
     
     mParameters.set(serialisedParameters);
+    
+    addParameterInput();
 }
 
 // Info
diff --git a/FrameLib_Objects/Vector/FrameLib_Sort.cpp b/FrameLib_Objects/Vector/FrameLib_Sort.cpp
@@ -12,7 +12,7 @@ FrameLib_Sort::FrameLib_Sort(FrameLib_Context context, FrameLib_Parameters::Seri
     
     mParameters.set(serialisedParameters);
     
-    mOrder = (Orders) mParameters.getInt(kOrder);
+    addParameterInput();
 }
 
 // Info
@@ -54,7 +54,7 @@ void FrameLib_Sort::process()
     
     double *output = getOutput(0, &size);
     
-    switch (mOrder)
+    switch ((Orders) mParameters.getInt(kOrder))
     {
         case kUp:
             sortAscending(output, input, size);
diff --git a/FrameLib_Objects/Vector/FrameLib_Sort.h b/FrameLib_Objects/Vector/FrameLib_Sort.h
@@ -32,8 +32,6 @@ class FrameLib_Sort : public FrameLib_Processor
     void process();
     
     // Data
-
-    Orders mOrder;
     
     static ParameterInfo sParamInfo;
 };
diff --git a/FrameLib_Objects/Vector/FrameLib_Split.cpp b/FrameLib_Objects/Vector/FrameLib_Split.cpp
@@ -13,6 +13,8 @@ FrameLib_Split::FrameLib_Split(FrameLib_Context context, FrameLib_Parameters::Se
     mParameters.addEnumItem(kRatio, "ratios");
     
     mParameters.set(serialisedParameters);
+    
+    addParameterInput();
 }
 
 // Info
diff --git a/FrameLib_Objects/Vector/FrameLib_Subframe.cpp b/FrameLib_Objects/Vector/FrameLib_Subframe.cpp
@@ -16,6 +16,8 @@ FrameLib_Subframe::FrameLib_Subframe(FrameLib_Context context, FrameLib_Paramete
     mParameters.addEnumItem(kRatio, "ratios");
     
     mParameters.set(serialisedParameters);
+    
+    addParameterInput();
 }
 
 // Info
diff --git a/FrameLib_Objects/Vector/FrameLib_Vector_Template.h b/FrameLib_Objects/Vector/FrameLib_Vector_Template.h
@@ -3,7 +3,6 @@
 #define FRAMELIB_VECTOR_TEMPLATE_H
 
 #include "FrameLib_DSP.h"
-#include <functional>
 
 template <double func(double *, unsigned long) > class FrameLib_Vector : public FrameLib_Processor
 {
@@ -45,7 +44,7 @@ template <double func(double *, unsigned long) > class FrameLib_Vector : public
             output[0] = func(input, sizeIn);
     }
     
-    // Operator description (specialise to change description)
+    // Operator Description (specialise to change description)
 
     const char *getOpString() { return "<vector operation>"; }
 };

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`FrameLib_Chop::FrameLib_Chop(FrameLib_Context context, FrameLib_Parameters::Serial serialisedParameters, void owner): FrameLib_Processor(context, owner, &sParamInfo)`
`7`	`7`	`{`
`8`		`- mParameters.addInt(kNumOuts, "numouts", 1, 0);`
	`8`	`+ mParameters.addInt(kNumOuts, "num_outs", 1, 0);`
`9`	`9`	`mParameters.setClip(2, 32);`
`10`	`10`	`mParameters.setInstantiation();`
`11`	`11`
`@@ -21,6 +21,8 @@ FrameLib_Chop::FrameLib_Chop(FrameLib_Context context, FrameLib_Parameters::Seri`
`21`	`21`	`mNumOuts = mParameters.getInt(kNumOuts);`
`22`	`22`
`23`	`23`	`setIO(1, mNumOuts);`
	`24`	`+`
	`25`	`+ addParameterInput();`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`// Info`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`#include "FrameLib_DSP.h"`
`6`	`6`
`7`		`-// FIX - time variable triggers`
	`7`	`+// FIX - time variable triggers?`
`8`	`8`
`9`	`9`	`class FrameLib_Join : public FrameLib_Processor`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`FrameLib_Pad::FrameLib_Pad(FrameLib_Context context, FrameLib_Parameters::Serial serialisedParameters, void owner) : FrameLib_Processor(context, owner, &sParamInfo, 1, 1)`
`7`	`7`	`{`
`8`		`- mParameters.addDouble(kPadding, "padding", 0.0, 0);`
	`8`	`+ mParameters.addDouble(kPadding, "pad", 0.0, 0);`
`9`	`9`
`10`	`10`	`mParameters.addDouble(kStart, "start", 0.0, 1);`
`11`	`11`	`mParameters.setMin(0.0);`
`@@ -18,6 +18,8 @@ FrameLib_Pad::FrameLib_Pad(FrameLib_Context context, FrameLib_Parameters::Serial`
`18`	`18`	`mParameters.addEnumItem(kRatio, "ratios");`
`19`	`19`
`20`	`20`	`mParameters.set(serialisedParameters);`
	`21`	`+`
	`22`	`+ addParameterInput();`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`// Info`
`@@ -54,7 +56,7 @@ FrameLib_Pad::ParameterInfo::ParameterInfo()`
`54`	`56`
`55`	`57`	`// Process`
`56`	`58`
`57`		`-void FrameLib_Pad::process ()`
	`59`	`+void FrameLib_Pad::process()`
`58`	`60`	`{`
`59`	`61`	`// Get Input`
`60`	`62`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ FrameLib_Shift::FrameLib_Shift(FrameLib_Context context, FrameLib_Parameters::Se`
`7`	`7`	`{`
`8`	`8`	`mParameters.addDouble(kShift, "shift", 0.0, 0);`
`9`	`9`
`10`		`- mParameters.addDouble(kPadding, "padding", 0.0, 1);`
	`10`	`+ mParameters.addDouble(kPadding, "pad", 0.0, 1);`
`11`	`11`
`12`	`12`	`mParameters.addEnum(kMode, "mode", 2);`
`13`	`13`	`mParameters.addEnumItem(kPad, "pad");`
`@@ -18,6 +18,8 @@ FrameLib_Shift::FrameLib_Shift(FrameLib_Context context, FrameLib_Parameters::Se`
`18`	`18`	`mParameters.addEnumItem(kRatio, "ratios");`
`19`	`19`
`20`	`20`	`mParameters.set(serialisedParameters);`
	`21`	`+`
	`22`	`+ addParameterInput();`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`// Info`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ FrameLib_Sort::FrameLib_Sort(FrameLib_Context context, FrameLib_Parameters::Seri`
`12`	`12`
`13`	`13`	`mParameters.set(serialisedParameters);`
`14`	`14`
`15`		`- mOrder = (Orders) mParameters.getInt(kOrder);`
	`15`	`+ addParameterInput();`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`// Info`
`@@ -54,7 +54,7 @@ void FrameLib_Sort::process()`
`54`	`54`
`55`	`55`	`double *output = getOutput(0, &size);`
`56`	`56`
`57`		`- switch (mOrder)`
	`57`	`+ switch ((Orders) mParameters.getInt(kOrder))`
`58`	`58`	`{`
`59`	`59`	`case kUp:`
`60`	`60`	`sortAscending(output, input, size);`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ FrameLib_Split::FrameLib_Split(FrameLib_Context context, FrameLib_Parameters::Se`
`13`	`13`	`mParameters.addEnumItem(kRatio, "ratios");`
`14`	`14`
`15`	`15`	`mParameters.set(serialisedParameters);`
	`16`	`+`
	`17`	`+ addParameterInput();`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`// Info`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ FrameLib_Subframe::FrameLib_Subframe(FrameLib_Context context, FrameLib_Paramete`
`16`	`16`	`mParameters.addEnumItem(kRatio, "ratios");`
`17`	`17`
`18`	`18`	`mParameters.set(serialisedParameters);`
	`19`	`+`
	`20`	`+ addParameterInput();`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`// Info`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`#define FRAMELIB_VECTOR_TEMPLATE_H`
`4`	`4`
`5`	`5`	`#include "FrameLib_DSP.h"`
`6`		`-#include <functional>`
`7`	`6`
`8`	`7`	`template <double func(double *, unsigned long) > class FrameLib_Vector : public FrameLib_Processor`
`9`	`8`	`{`
`@@ -45,7 +44,7 @@ template <double func(double *, unsigned long) > class FrameLib_Vector : public`
`45`	`44`	`output[0] = func(input, sizeIn);`
`46`	`45`	`}`
`47`	`46`
`48`		`- // Operator description (specialise to change description)`
	`47`	`+ // Operator Description (specialise to change description)`
`49`	`48`
`50`	`49`	`const char *getOpString() { return "<vector operation>"; }`
`51`	`50`	`};`