Skip to content

Commit

Permalink
Reduce amount of parameters to avoid crashing bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@ffont
ffont committed Aug 30, 2020
1 parent eecefca commit 32b50f7
Show file tree
Hide file tree
Showing 6 changed files with 3,095 additions and 5,445 deletions.
4,272 changes: 2,106 additions & 2,166 deletions JuceLibraryCode/BinaryData.cpp
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion JuceLibraryCode/BinaryData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace BinaryData
const int KijimiMainPanelBackground_pngSize = 201945;

extern const char* default_state_xml;
const int default_state_xmlSize = 185714;
const int default_state_xmlSize = 180918;

extern const char* Cholesky;
const int CholeskySize = 1206;
Expand Down
2,080 changes: 987 additions & 1,093 deletions Resources/default_state.xml
View file

Large diffs are not rendered by default.

1,495 changes: 0 additions & 1,495 deletions Source/KIJIMIControlPanelComponent.h
View file

Large diffs are not rendered by default.

115 changes: 0 additions & 115 deletions Source/KIJIMIInterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,121 +112,6 @@ class KIJIMIInterface: public ActionBroadcaster
synthControls.push_back(KIJIMISynthControl("KIJIMI_GLIDE_RATE", "Glide rate", "knob", 86, 51, "direct", 127, true, true));
synthControls.push_back(KIJIMISynthControl("KIJIMI_GLIDE_MODE", "Glide mode", "button2", 32, 79, "21_63_105", 2, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_VOLUME", "Volume", "knob", 87, 52, "direct", 127, true, true));
synthControls.push_back(KIJIMISynthControl("KIJIMI_CC_RECEIVE", "CC Receive", "button1", -1, 69, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_MPE_CH", "MPE base channel", "knob", -1, 76, "None", 7, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_MIDI_CH", "MIDI channel", "knob", -1, 77, "None", 16, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_MAX_VOICES", "Maximum number of voices", "knob", -1, 80, "None", 8, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_ADSR_MOD_MODE", "ADSR2 modulation mode", "button2", -1, 234, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_CYCLE_MODE", "Cycle poly/mono", "button2", -1, 95, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_KT_MULTIPLIER", "KT multiplier", "button2", -1, 96, "None", 3, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO_MAX_R", "LFO max rate", "knob", -1, 92, "None", 100, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO_MIN_R", "LFO min rate", "knob", -1, 93, "None", 100, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO_MODE", "LFO poly/mono", "button2", -1, 94, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO_MOD_MODE", "LFO modulation mode", "button2", -1, 129, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO_POLY_RETRIG", "LFO Poly mode EG retrig", "button2", -1, 235, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO_SUST", "LFO sustain", "button2", -1, 86, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1_ENV_DEST", "LFO1 envelope destination", "button2", -1, 126, "None", 2, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1_ENV_MAX_T", "LFO1 envelope max time", "button2", -1, 130, "None", 20, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1_ENV_P", "LFO1 envelope polarity", "button2", -1, 132, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1_SYNC", "LFO1 sync", "button2", -1, 125, "None", 2, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2_ENV_DEST", "LFO2 envelope destination", "button2", -1, 128, "None", 2, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2_ENV_MAX_T", "LFO2 envelope max time", "button2", -1, 131, "None", 20, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2_ENV_P", "LFO2 envelope polarity", "button2", -1, 133, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2_SYNC", "LFO2 sync", "button2", -1, 127, "None", 2, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_MODW_P", "Modwheel polarity", "button2", -1, 87, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_ADSR_VCA", "ADSR VCA level 0-100%", "knob", -1, 78, "None", 10, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_MASTER_VOL", "Master volume (12 levels)", "knob", -1, 84, "None", 12, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_VCO_DETUNE", "VCO detune 0-3Hz", "knob", -1, 82, "None", 30, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_CARDS_VOCIE", "Cards per voice", "knob", -1, 67, "None", 2, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LEG_EG_RETRIG", "Legato EG retrig", "button2", -1, 72, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LEG_PRIORITY", "Legato priority", "button2", -1, 73, "None", 2, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_MONO_MODE", "Mono mode", "button2", -1, 70, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_MONO_POLY", "Mono/poly/unisson", "button2", -1, 75, "None", 2, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_SUSTAIN_MODE", "Sustain mode", "button2", -1, 71, "None", 1, true, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO1_AM", "LFO1 to VCO1 amount", "knob", -1, 134, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO2_AM", "LFO1 to VCO2 amount", "knob", -1, 135, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE1_AM", "LFO1 to WAVE1 amount", "knob", -1, 136, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE2_AM", "LFO1 to WAVE2 amount", "knob", -1, 137, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1SUB_AM", "LFO1 to SUB amount", "knob", -1, 138, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCF_AM", "LFO1 to VCF amount", "knob", -1, 139, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1RESO_AM", "LFO1 to RESO amount", "knob", -1, 140, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCA_AM", "LFO1 to VCA amount", "knob", -1, 141, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO1_AM", "LFO2 to VCO1 amount", "knob", -1, 142, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO2_AM", "LFO2 to VCO2 amount", "knob", -1, 143, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE1_AM", "LFO2 to WAVE1 amount", "knob", -1, 144, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE2_AM", "LFO2 to WAVE2 amount", "knob", -1, 145, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2SUB_AM", "LFO2 to SUB amount", "knob", -1, 146, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCF_AM", "LFO2 to VCF amount", "knob", -1, 147, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2RESO_AM", "LFO2 to RESO amount", "knob", -1, 148, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCA_AM", "LFO2 to VCA amount", "knob", -1, 149, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_ADSR2VCO1_AM", "ADSR2 to VCO1 amount", "knob", -1, 150, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_ADSR2VCO2_AM", "ADSR2 to VCO2 amount", "knob", -1, 151, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_ADSR2WAVE1_AM", "ADSR2 to WAVE1 amount", "knob", -1, 152, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_ADSR2WAVE2_AM", "ADSR2 to WAVE2 amount", "knob", -1, 153, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO1_R", "LFO1 to VCO1 rate", "knob", -1, 154, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO2_R", "LFO1 to VCO2 rate", "knob", -1, 155, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE1_R", "LFO1 to WAVE1 rate", "knob", -1, 156, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE2_R", "LFO1 to WAVE2 rate", "knob", -1, 157, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1SUB_R", "LFO1 to SUB rate", "knob", -1, 158, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCF_R", "LFO1 to VCF rate", "knob", -1, 159, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1RESO_R", "LFO1 to RESO rate", "knob", -1, 160, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCA_R", "LFO1 to VCA rate", "knob", -1, 161, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO1_R", "LFO2 to VCO1 rate", "knob", -1, 162, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO2_R", "LFO2 to VCO2 rate", "knob", -1, 163, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE1_R", "LFO2 to WAVE1 rate", "knob", -1, 164, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE2_R", "LFO2 to WAVE2 rate", "knob", -1, 165, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2SUB_R", "LFO2 to SUB rate", "knob", -1, 166, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCF_R", "LFO2 to VCF rate", "knob", -1, 167, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2RESO_R", "LFO2 to RESO rate", "knob", -1, 168, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCA_R", "LFO2 to VCA rate", "knob", -1, 169, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO1_A", "LFO1 to VCO1 attack", "knob", -1, 170, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO2_A", "LFO1 to VCO2 attack", "knob", -1, 171, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE1_A", "LFO1 to WAVE1 attack", "knob", -1, 172, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE2_A", "LFO1 to WAVE2 attack", "knob", -1, 173, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1SUB_A", "LFO1 to SUB attack", "knob", -1, 174, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCF_A", "LFO1 to VCF attack", "knob", -1, 175, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1RESO_A", "LFO1 to RESO attack", "knob", -1, 176, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCA_A", "LFO1 to VCA attack", "knob", -1, 177, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO1_A", "LFO2 to VCO1 attack", "knob", -1, 178, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO2_A", "LFO2 to VCO2 attack", "knob", -1, 179, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE1_A", "LFO2 to WAVE1 attack", "knob", -1, 180, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE2_A", "LFO2 to WAVE2 attack", "knob", -1, 181, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2SUB_A", "LFO2 to SUB attack", "knob", -1, 182, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCF_A", "LFO2 to VCF attack", "knob", -1, 183, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2RESO_A", "LFO2 to RESO attack", "knob", -1, 184, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCA_A", "LFO2 to VCA attack", "knob", -1, 185, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO1_D", "LFO1 to VCO1 decay", "knob", -1, 186, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO2_D", "LFO1 to VCO2 decay", "knob", -1, 187, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE1_D", "LFO1 to WAVE1 decay", "knob", -1, 188, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE2_D", "LFO1 to WAVE2 decay", "knob", -1, 189, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1SUB_D", "LFO1 to SUB decay", "knob", -1, 190, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCF_D", "LFO1 to VCF decay", "knob", -1, 191, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1RESO_D", "LFO1 to RESO decay", "knob", -1, 192, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCA_D", "LFO1 to VCA decay", "knob", -1, 193, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO1_D", "LFO2 to VCO1 decay", "knob", -1, 194, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO2_D", "LFO2 to VCO2 decay", "knob", -1, 195, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE1_D", "LFO2 to WAVE1 decay", "knob", -1, 196, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE2_D", "LFO2 to WAVE2 decay", "knob", -1, 197, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2SUB_D", "LFO2 to SUB decay", "knob", -1, 198, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCF_D", "LFO2 to VCF decay", "knob", -1, 199, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2RESO_D", "LFO2 to RESO decay", "knob", -1, 200, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCA_D", "LFO2 to VCA decay", "knob", -1, 201, "None", 127, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO1_ENV", "LFO1 to VCO1 envelope", "button1", -1, 218, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCO2_ENV", "LFO1 to VCO2 envelope", "button1", -1, 219, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE1_ENV", "LFO1 to WAVE1 envelope", "button1", -1, 220, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1WAVE2_ENV", "LFO1 to WAVE2 envelope", "button1", -1, 221, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1SUB_ENV", "LFO1 to SUB envelope", "button1", -1, 222, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCF_ENV", "LFO1 to VCF envelope", "button1", -1, 223, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1RESO_ENV", "LFO1 to RESO envelope", "button1", -1, 224, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO1VCA_ENV", "LFO1 to VCA envelope", "button1", -1, 225, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO1_ENV", "LFO2 to VCO1 envelope", "button1", -1, 226, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCO2_ENV", "LFO2 to VCO2 envelope", "button1", -1, 227, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE1_ENV", "LFO2 to WAVE1 envelope", "button1", -1, 228, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2WAVE2_ENV", "LFO2 to WAVE2 envelope", "button1", -1, 229, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2SUB_ENV", "LFO2 to SUB envelope", "button1", -1, 230, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCF_ENV", "LFO2 to VCF envelope", "button1", -1, 231, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2RESO_ENV", "LFO2 to RESO envelope", "button1", -1, 232, "None", 1, false, false));
synthControls.push_back(KIJIMISynthControl("KIJIMI_LFO2VCA_ENV", "LFO2 to VCA envelope", "button1", -1, 233, "None", 1, false, false));
// --> End auto-generated code A

#if JUCE_DEBUG
Expand Down
Loading

0 comments on commit 32b50f7

Please sign in to comment.