blumia/juicysfplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keyboard left/right triggers pill button click (as it used to). pills now send you to first valid preset in bank (as they used to).

Browse Source
This commit is contained in:
Alex Birch 2019-07-21 16:25:22 +01:00
parent 304ec6ce88
commit 5c310a1606
No known key found for this signature in database
GPG Key ID: 305EB1F98D44ACBA
1 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Source/Pills.cpp
View File

@ -63,12 +63,34 @@ void Pill::bankChanged(int bank) {
// } // }
void Pill::buttonClicked(Button* button) { void Pill::buttonClicked(Button* button) {
ValueTree banks{valueTreeState.state.getChildWithName("banks")};
int banksChildren{banks.getNumChildren()};
ValueTree bank;
for(int bankIx{0}; bankIx<banksChildren; bankIx++) {
ValueTree currentBank{banks.getChild(bankIx)};
int bankNum{currentBank.getProperty("num")};
if (bankNum == this->bank) {
bank = currentBank;
break;
}
}
ValueTree preset{bank.getChild(0)};
int presetNum{preset.getProperty("num")};
// selected = button; // selected = button;
// onItemSelected(itemToIDMapper(button->getName().toStdString())); // onItemSelected(itemToIDMapper(button->getName().toStdString()));
{
RangedAudioParameter *param{valueTreeState.getParameter("bank")}; RangedAudioParameter *param{valueTreeState.getParameter("bank")};
jassert(dynamic_cast<AudioParameterInt*>(param) != nullptr); jassert(dynamic_cast<AudioParameterInt*>(param) != nullptr);
AudioParameterInt* castParam{dynamic_cast<AudioParameterInt*>(param)}; AudioParameterInt* castParam{dynamic_cast<AudioParameterInt*>(param)};
*castParam = bank; *castParam = this->bank;
}
{
RangedAudioParameter *param{valueTreeState.getParameter("preset")};
jassert(dynamic_cast<AudioParameterInt*>(param) != nullptr);
AudioParameterInt* castParam{dynamic_cast<AudioParameterInt*>(param)};
*castParam = presetNum;
}
} }
// void Pill::parameterChanged(const String& parameterID, float newValue) { // void Pill::parameterChanged(const String& parameterID, float newValue) {
@ -208,31 +230,41 @@ void Pills::cycle(bool right) {
RangedAudioParameter *param {valueTreeState.getParameter("bank")}; RangedAudioParameter *param {valueTreeState.getParameter("bank")};
jassert(dynamic_cast<AudioParameterInt*> (param) != nullptr); jassert(dynamic_cast<AudioParameterInt*> (param) != nullptr);
AudioParameterInt* castParam {dynamic_cast<AudioParameterInt*> (param)}; AudioParameterInt* castParam {dynamic_cast<AudioParameterInt*> (param)};
int currentlySelectedBank{castParam->get()}; int bank{castParam->get()};
ValueTree banks{valueTreeState.state.getChildWithName("banks")}; // ValueTree banks{valueTreeState.state.getChildWithName("banks")};
// int numChildren{banks.getNumChildren()}; // int numChildren{banks.getNumChildren()};
vector<int> bankInts; // vector<int> bankInts;
bankInts.resize(banks.getNumChildren()); // bankInts.resize(banks.getNumChildren());
transform(banks.begin(), banks.end(), bankInts.begin(), [](ValueTree bank) -> int { // transform(banks.begin(), banks.end(), bankInts.begin(), [](ValueTree bank) -> int {
return bank.getProperty("num"); // return bank.getProperty("num");
}); // });
// int closestBank{currentlySelectedBank}; // int closestBank{bank};
// for(int i{0}; i < numChildren; i++) { // for(int i{0}; i < numChildren; i++) {
// ValueTree child{banks.getChild(i)}; // ValueTree child{banks.getChild(i)};
// int proposedBank{child.getProperty("num")}; // int proposedBank{child.getProperty("num")};
// if (right && proposedBank > currentlySelectedBank) { // if (right && proposedBank > bank) {
// closestBank = jmin(closestBank, proposedBank); // closestBank = jmin(closestBank, proposedBank);
// } else if (left ) // } else if (left )
// } // }
int currentIx{static_cast<const int>(distance(bankInts.begin(), find(bankInts.begin(), bankInts.end(), currentlySelectedBank)))}; // int currentIx{static_cast<const int>(distance(bankInts.begin(), find(bankInts.begin(), bankInts.end(), currentlySelectedBank)))};
// currentIx += right ? 1 : pills.size()-1;
// // pills[currentIx % pills.size()]->textButton.triggerClick();
// *castParam = bankInts[currentIx % bankInts.size()];
int currentIx = static_cast<const int>(
distance(
pills.begin(),
find_if(
pills.begin(),
pills.end(),
[bank](unique_ptr<Pill>& pill){return pill->bank == bank;})));
currentIx += right ? 1 : pills.size()-1; currentIx += right ? 1 : pills.size()-1;
// pills[currentIx % pills.size()]->textButton.triggerClick(); pills[currentIx % pills.size()]->textButton.triggerClick();
*castParam = bankInts[currentIx % bankInts.size()];
// TODO: base this on valueTree // TODO: base this on valueTree