bp/FrameLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vector Object Revisions part 1

Browse Source
This commit is contained in:
Alex Harker
2017-10-11 22:55:12 +01:00
parent 7a15609c57
commit ecab2389a0
13 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FrameLib_Objects/Vector/FrameLib_Chop.cpp
+3 -1
View File
@@ -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
FrameLib_Objects/Vector/FrameLib_Join.cpp
+2 -2
View File
@@ -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);
FrameLib_Objects/Vector/FrameLib_Join.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "FrameLib_DSP.h"
// FIX - time variable triggers
// FIX - time variable triggers?
class FrameLib_Join : public FrameLib_Processor
{
FrameLib_Objects/Vector/FrameLib_MedianFilter.cpp
+3 -3
View File
@@ -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
FrameLib_Objects/Vector/FrameLib_Pad.cpp
+4 -2
View File
@@ -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
FrameLib_Objects/Vector/FrameLib_Percentile.cpp
+2 -2
View File
@@ -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;
FrameLib_Objects/Vector/FrameLib_Percentile.h
+1 -3
View File
@@ -31,10 +31,8 @@ private:
void process();
// Data
double mPercentile;
static ParameterInfo sParamInfo;
};
#endif
#endif
FrameLib_Objects/Vector/FrameLib_Shift.cpp
+3 -1
View File
@@ -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
FrameLib_Objects/Vector/FrameLib_Sort.cpp
+2 -2
View File
@@ -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);
FrameLib_Objects/Vector/FrameLib_Sort.h
-2
View File
@@ -32,8 +32,6 @@ private:
void process();
// Data
Orders mOrder;
static ParameterInfo sParamInfo;
};
FrameLib_Objects/Vector/FrameLib_Split.cpp
+2
View File
@@ -13,6 +13,8 @@ FrameLib_Split::FrameLib_Split(FrameLib_Context context, FrameLib_Parameters::Se
mParameters.addEnumItem(kRatio, "ratios");
mParameters.set(serialisedParameters);
addParameterInput();
}
// Info
FrameLib_Objects/Vector/FrameLib_Subframe.cpp
+2
View File
@@ -16,6 +16,8 @@ FrameLib_Subframe::FrameLib_Subframe(FrameLib_Context context, FrameLib_Paramete
mParameters.addEnumItem(kRatio, "ratios");
mParameters.set(serialisedParameters);
addParameterInput();
}
// Info
FrameLib_Objects/Vector/FrameLib_Vector_Template.h
+1 -2
View File
@@ -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 @@ protected:
output[0] = func(input, sizeIn);
}
// Operator description (specialise to change description)
// Operator Description (specialise to change description)
const char *getOpString() { return "<vector operation>"; }
};