commit 9419c1eaea51e1df8be126638b28dee328c5f532
parent e0dcc19d528ce088e27e39b20105156b27d27c26
Author: Adam M <aemalone@gmail.com>
Date: Tue, 6 Aug 2019 00:54:23 -0500
Need default constructors
Diffstat:
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/ComputerscareLaundrySoup.cpp b/src/ComputerscareLaundrySoup.cpp
@@ -92,7 +92,7 @@ struct ComputerscareLaundrySoup : Module {
rack::dsp::SchmittTrigger manualResetTriggers[numFields];
LaundrySoupSequence laundrySequences[numFields];
-//LaundryPoly laundryPoly;
+ LaundryPoly laundryPoly[numFields];
bool activeStep[numFields] = {false};
@@ -109,6 +109,9 @@ struct ComputerscareLaundrySoup : Module {
setNextAbsoluteSequence(i);
checkIfShouldChange(i);
resetOneOfThem(i);
+ LaundryPoly lp = LaundryPoly("#");
+ laundryPoly[i] = lp;
+ //laundryPoly[i] = LaundryPoly("2");
}
}
void process(const ProcessArgs &args) override;
diff --git a/src/dtpulse.cpp b/src/dtpulse.cpp
@@ -394,6 +394,9 @@ void whoKnowsLaundryPoly(std::string input) {
lss[i] = LaundrySoupSequence(newFormula);
}
}
+ LaundryPoly::LaundryPoly() {
+ LaundryPoly("");
+ }
void LaundryPoly::print() {
for(int i = 0; i < 16; i++) {
printf("channel %i:",i+1);
@@ -617,7 +620,7 @@ Parser::Parser(std::string expr) {
Parser::Parser() {
Parser("");
}
-void Parser::setForPolyLaundry() {
+void Parser::setForLaundryPoly() {
}
void Parser::setForLaundry() {
diff --git a/src/dtpulse.hpp b/src/dtpulse.hpp
@@ -43,7 +43,7 @@ class Parser {
Token skipAndPeekToken();
void setForCookies();
void setForLaundry();
- void setForPolyLaundry();
+ void setForLaundryPoly();
void skipToken();
void setExactValue(Token t);
void setForExactIntegers(Token t);
@@ -143,10 +143,11 @@ class Quantizer {
std::vector<float> generateMappedValues();
};
class LaundryPoly {
-public:
- LaundrySoupSequence lss[16];
- LaundryPoly(std::string formula);
- void print();
+ public:
+ LaundrySoupSequence lss[16];
+ LaundryPoly(std::string formula);
+ LaundryPoly();
+ void print();
};
bool matchesAny(std::string val, std::vector<std::string> whitelist);
bool is_digits(const std::string &str);