.gitignore

@@ -1 +0,0 @@
-.DS_Store

common.js

@@ -43,20 +43,12 @@ function Switch(props){
         e('span', {className: 'slider round'}, null))
 }
 
-function SendSaveEvent(){
-    setTimeout(() => {
-            window.dispatchEvent(new CustomEvent('saveDict', {'detail' : "localStorage"}));
-        }, 50)
-}
-
 function CreateParamChanger(arr, setArr, index, postCB=() => {}, preCB=(val) => val){
     return (event) => {
         let newArr = arr.slice();
         newArr[index] = preCB(event.target.value);
         setArr(newArr);
         postCB();
-        SendSaveEvent();
-        
         log(`${index} ${event.target.value}`);
     }
 }
@@ -68,7 +60,6 @@ function CreateMatrixParamChanger(matrix, setMatrix, i, j){
         });
         newMatrix[i][j] = event.target.value;
         setMatrix(newMatrix);
-        SendSaveEvent();
         log(`${i}, ${j} ${event.target.value}`);
         
     }

enums.js

@@ -4,18 +4,14 @@
 
 
 
-function DataCell(element) {
-    return e('td', null, element);
-}
-
 // NOT A REACT FUNCTIONAL COMPONENT.  MERELY RETURNS AN ARRAY WHICH IS UNPACKED
 function EnumeratorItems(index, enumBreakPoints, setEnumBreakPoints, enumNames, setEnumNames, djParam, locked){
     let items = [];
     for (let i = 0; i < MAXENUMPOINTS; i++){
         
-        items.push(DataCell(e(TextBox, {locked, onChange: CreateMatrixParamChanger(enumNames, setEnumNames, index, i), value: enumNames[index][i], id:`text-${djParam}-${enumNames[index][i]}`}, null)));
+        items.push(ListItem(e(TextBox, {locked, onChange: CreateMatrixParamChanger(enumNames, setEnumNames, index, i), value: enumNames[index][i], id:`text-${djParam}-${enumNames[index][i]}`}, null)));
         // Add 1 to make up for the lower enum bound
-        items.push(DataCell(e(NumberBox, {locked, onChange: CreateMatrixParamChanger(enumBreakPoints, setEnumBreakPoints, index, i + 1), value:enumBreakPoints[index][i + 1]}, null)));
+        items.push(ListItem(e(NumberBox, {locked, onChange: CreateMatrixParamChanger(enumBreakPoints, setEnumBreakPoints, index, i + 1), value:enumBreakPoints[index][i + 1]}, null)));
     }
     return items;
 }
@@ -23,15 +19,15 @@ function EnumeratorItems(index, enumBreakPoints, setEnumBreakPoints, enumNames,
 function EnumeratorRow(props){
     let linkedText = props.linked ? "<- mods" : "";
 
-    let content = e('tr', {className: 'lfo-item', id: `${props.djParam}-enum-row`},
+    let content = e('ul', {className: 'lfo-item', id: `${props.djParam}-enum-row`},
-        DataCell(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})), 
+        ListItem(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})), 
-        DataCell(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
+        ListItem(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
-        DataCell(e(NumberBox, {locked:props.locked, onChange: props.setEnumItemCounts, step:1, value:props.enumItems, className: 'enum-count'}, null)),
+        ListItem(e(NumberBox, {locked:props.locked, onChange: props.setEnumItemCounts, step:1, value:props.enumItems, className: 'enum-count'}, null)),
-        DataCell(e(NumberBox, {locked:props.locked, onChange: CreateMatrixParamChanger(props.enumBreakPoints, props.setEnumBreakPoints, props.index, 0), value:props.enumBreakPoints[props.index][0], step:0.1}, null)),
+        ListItem(e(NumberBox, {locked:props.locked, onChange: CreateMatrixParamChanger(props.enumBreakPoints, props.setEnumBreakPoints, props.index, 0), value:props.enumBreakPoints[props.index][0], step:0.1}, null)),
         ...(EnumeratorItems(props.index, props.enumBreakPoints, props.setEnumBreakPoints, props.enumNames, props.setEnumNames, props.djParam, props.locked).slice(0, props.enumItems * 2)),
-        DataCell(e(Button, {locked:props.locked, text:'+', onClick: props.addEnum}, null)), 
+        ListItem(e(Button, {locked:props.locked, text:'+', onClick: props.addEnum}, null)), 
-        DataCell(e(Button, {locked:props.locked, text:'-', onClick: props.removeEnum}, null)),
+        ListItem(e(Button, {locked:props.locked, text:'-', onClick: props.removeEnum}, null)),
-        DataCell(e("div", {className:"linked"}, linkedText))
+        ListItem(e("div", {className:"linked"}, linkedText))
     );
     if (props.visible){
         return content;

lfogui.css

@@ -3,161 +3,45 @@
   --unlocked-color: #ff5153;
 }
 
-:root {
+html, body {
-    --background: white;
-    --active: royalblue;
-    --nonactive: rgb(205, 205, 205);
-    --alert: red;
-    --textcolor: black;
-}
-
-@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
-
-html {
-    background-color: var(--background);
-}
-
-body {
-    font-family: "Poppins", sans-serif;
-}
-
-html,
-body {
   width: 100%;
   height: 100%;
   margin: 0px;
   border: 0;
-    overflow-x: scroll;
+  overflow: hidden;  /*  Disable scrollbars */
-    overflow-y: scroll;
+  display: block;    /* No floating content on sides */
-    display: block;
-    /* No floating content on sides */
 }
 
-/*navigation*/
+ul {
-.header {
+    list-style-type: none;
-    display: flex;
-    flex-flow: row nowrap;
-    justify-content: space-between;
-    align-items: center;
-    margin: 1em;
-    border-bottom: 1px solid var(--active);
-}
-
-.header button {
-    border: 1px solid var(--active);
-    color: var(--active);
-    background-color: white;
-    padding: 4px;
-    text-align: center;
-    display: inline-block;
-    padding: 0.5em;
-    margin: 4px;
-    font-size: 0.9em;
-    min-width: 4.5em;
-}
-
-td button {
-    background-color: white;
-    color: var(--active);
-    border: 1px solid var(--active);
-}
-
-/* :::::::::::::: SELECTING MODULATORS/ENUMERATORS */
-
-.header button.highlighted-button {
-    color: var(--active);
-    border: 1px solid var(--active);
-}
-
-.header button.unhighlighted-button {
-    color: var(--nonactive);
-    border: 1px solid var(--nonactive);
-}
-
-/* table */
-table {
-    margin: 1em;
-    padding: 0em;
-    border-collapse: collapse;
-    background-color: lightsteelblue;
-}
-
-/* points datacells should have a min-width*/
-.enum-count {
-    min-width: 5.6em;
-}
-
-th {
-    padding: 0.4em 0.3em;
-    text-align: left;
-}
-
-thead {
-    color: white;
-    background-color: var(--active);
-}
-
-tr,
-td {
-    margin: 0em;
-}
-
-td:last-child {
-    white-space: nowrap;
-    overflow: hidden;
-    padding: 0;
-}
-
-/* input types */
-/* dropdown list */
-select {
-    width: 100%;
-}
-
-/*
-option, select>* {
-    font-size: 0.8em !important;
-    padding: 0em !important;
-    margin: 0em !important;
-    min-height: 0em !important;
-}
-*/
-option {
-    background-color: var(--active);
-}
-
-option:not(:checked) {
-    background-color: white;
-}
-
-/* input */
-input,
-select {
-    border: 1px solid var(--active);
-    color: var(--active);
     margin: 0;
     padding: 0;
-    line-height: 1.5em;
+    overflow: hidden;
-    height: 1.5em;
+    background-color: #333333;
-    box-sizing: border-box;
 }
 
-input {
+li {
-    padding-left: 5px;
+    float: left;
-    /*slight padding on left*/
 }
 
+
 input[type=number] {
     width: 50px;
+    margin: 0;
+    padding: 0;
 }
 
 input[type=text] {
     width: 60px;
+    margin: 0;
+    padding: 0;
     font-weight: bold;
 }
 
 .timeInput {
   width: 80px;
+  margin: 0;
+  padding: 0;
 }
 
 #matrix {
@@ -204,38 +88,51 @@ input[type=text] {
 }
 
 /* The slider */
-input[type="range"] {
+.slider {
-    appearance: none;
+  position: absolute;
-    -webkit-appearance: none;
+  cursor: pointer;
-    height: 8px;
+  top: 0;
-    border-radius: 6px;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ccc;
+  -webkit-transition: .4s;
+  transition: .4s;
+}
+
+.slider:before {
+  position: absolute;
+  content: "";
+  height: 13px;
+  width: 13px;
+  left: 2px;
+  bottom: 2px;
   background-color: white;
-    outline: none;
+  -webkit-transition: .4s;
-    opacity: 0.7;
+  transition: .4s;
-    -webkit-transition: .2s;
-    transition: opacity .2s;
-    overflow: hidden;
 }
 
-/*slider knob*/
+input:checked + .slider {
-input[type="range"]::-webkit-slider-runnable-track {
+  background-color: #2196F3;
-    -webkit-appearance: none;
-    color: var(--active);
-    margin-top: -1px;
 }
 
-input[type="range"]::-webkit-slider-thumb {
+input:focus + .slider {
-    -webkit-appearance: none;
+  box-shadow: 0 0 1px #2196F3;
-    appearance: none;
+}
-    width: 20px;
+
-    height: 20px;
+input:checked + .slider:before {
+  -webkit-transform: translateX(13px);
+  -ms-transform: translateX(13px);
+  transform: translateX(13px);
+}
+
+/* Rounded sliders */
+.slider.round {
+  border-radius: 17px;
+}
+
+.slider.round:before {
   border-radius: 50%;
-    background: var(--active);
-    box-shadow: -80px 0 0 80px var(--active);
-}
-
-input[type="range"]::-moz-range-progress {
-    background-color: var(--active);
 }
 
 h5 {
@@ -243,6 +140,10 @@ h5 {
   padding: 0;
 }
 
+.enum-count {
+  background-color: aquamarine;
+}
+
 .label {
   background-color: aliceblue;
   padding: 0 4px 0 4px;
@@ -252,13 +153,12 @@ h5 {
 }
 
 .base-val {
-    border: none;
+  background-color: lightgray;
-    color: white;
+  border-color: #333333;
-    text-align: center;
+  border-width: 1px;
-    font-size: 0.9em;
   width: 50px;
-    margin: 0;
+  margin-left: 2px;
-    padding: 0;
+  margin-top: 1px;
 }
 
 .linked {
@@ -268,8 +168,6 @@ h5 {
   font-size: small;
   margin-left: 2px;
   margin-top: 5px;
-    display: none;
-    /*hide*/
 }
 
 
@@ -277,7 +175,6 @@ h5 {
   0% {
     color: black;
   }
-
   100% {
     color: red;
   }
@@ -295,6 +192,12 @@ h5 {
   color : white;
 }
 
+.container {
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
+}
+
 /* Locked */
 .lock {
   margin-top: 14px;
@@ -307,7 +210,6 @@ h5 {
   -webkit-transition: all 0.1s ease-in-out;
   transition: all 0.1s ease-in-out;
 }
-
 .lock:after {
   content: "";
   display: block;
@@ -321,7 +223,6 @@ h5 {
   -webkit-transition: all 0.1s ease-in-out;
   transition: all 0.1s ease-in-out;
 }
-
 .lock:before {
   content: "";
   display: block;
@@ -338,38 +239,31 @@ h5 {
   -webkit-transition: all 0.1s ease-in-out;
   transition: all 0.1s ease-in-out;
 }
-
 /* Locked Hover */
 .lock:hover:before {
   height: 12px;
 }
-
 /* Unlocked */
 .unlocked {
   transform: rotate(10deg);
 }
-
 .unlocked:before {
   bottom: 130%;
   left: 31%;
   margin-left: -11.5px;
   transform: rotate(-45deg);
 }
-
 .unlocked,
 .unlocked:before {
   border-color: var(--unlocked-color);
 }
-
 .unlocked:after {
   background: var(--unlocked-color);
 }
-
 /* Unlocked Hover */
 .unlocked:hover {
   transform: rotate(3deg);
 }
-
 .unlocked:hover:before {
   height: 10px;
   left: 40%;

lfogui.html

@@ -7,7 +7,6 @@
 -->
 
 <head>
-    <meta charset="utf-8">
   <link rel="stylesheet" href="./lfogui.css">
 </head>
 
@@ -20,7 +19,10 @@
   <script src="./common.js"></script>
   <script src="./enums.js"></script>
   <script src="./modulators.js"></script>
-    <script src="./lfogui.js"></script>
+  <script src="./lfogui.js">
+  
+    
+  </script>
 
 </body>
 

lfogui.js

@@ -9,10 +9,9 @@ else
 const e = React.createElement;
 
 let lfos = [];
-const MAXLFOS = 200;
+const MAXLFOS = 20;
-const MAXENUMS = 200;
+const MAXENUMS = 20;
 const MAXENUMPOINTS = 10;
-const MAXUSERDEFINED = 4;
 
 
 
@@ -30,8 +29,8 @@ const LockModes = Object.freeze({
 var modPhases = Array(MAXLFOS).fill(0);
 var firstUpdateTime = Date.now();
 
-const MODULATORLABELS = ["inst", "type", "shape", "param", "timebase", "min", "max", "phase", "center", "result", "", ""];
+const MODULATORLABELS = ["inst", "-type-", "---shape---", "-------param-------", "--timebase--", "-min-", "-max", "-phase-", "center"];
-const ENUMERATORLABELS = ["inst", "parameter", "# points"];
+const ENUMERATORLABELS = ["inst", "---parameter---", "-# points-"];
 
 
 function parseLfoTimeNonMusical(lfoTime){
@@ -61,12 +60,19 @@ function nnFreqToHzString(num) {
 
 
 function MasterLfoHandler(){
+
     let initVisArr = Array(MAXLFOS).fill(false);
     initVisArr[0] = true;
 
     const [viewMode, setViewMode] = React.useState(ViewModes.MOD);
+    const toggleViewMode = () => {
+        if (viewMode === ViewModes.MOD)
+            setViewMode(ViewModes.ENUM);
+        else
+            setViewMode(ViewModes.MOD);
+    };
 
-    const [lockMode, setLockMode] = React.useState(LockModes.UNLOCK);
+    const [lockMode, setLockMode] = React.useState(LockModes.LOCK);
     const toggleLockMode = () => {
         if (lockMode === LockModes.UNLOCK)
             setLockMode(LockModes.LOCK);
@@ -74,35 +80,15 @@ function MasterLfoHandler() {
             setLockMode(LockModes.UNLOCK);
     };
 
-    const [enabled, setEnabled] = React.useState(false);
-    const toggleEnabled = () => {
-        setEnabled(!enabled);
-    };
-
-    const displayIfEnabled = (content) => {
-        if (enabled)
-            return content
-    }
-
-    let toggleEnabledText = enabled ? `Hide \u{25BE}` : `Show \u{25B8}`;
-
     /// MODULATOR ARRAYS
-    let userDefinedWavesBase = [];
-    let userDefinedFunctionsBase = [];
-    let userDefinedTypesBase = [0, 0, 0, 0]; //0 = wave, 1 = function
 
-    for (let i = 0; i < MAXUSERDEFINED; i++) {
+    const [userDefinedWave, setUserDefinedWave] = React.useState(Array(50).fill(0));
-        userDefinedWavesBase.push(Array(50).fill(0));
+
-        userDefinedFunctionsBase.push(Array(101).fill(0));
-    }
-    const [userDefinedWaves, setUserDefinedWaves] = React.useState(userDefinedWavesBase);
-    const [userDefinedFunctions, setUserDefinedFunctions] = React.useState(userDefinedFunctionsBase);
-    const [userDefinedTypes, setUserDefinedTypes] = React.useState(userDefinedTypesBase);
     const [modVisibleArr, setModVisibleArr] = React.useState(initVisArr);
     const [modTypeArr, setModTypeArr] = React.useState(Array(MAXLFOS).fill('LFO'));
     const [modInstanceNumArr, setModInstanceNumArr] = React.useState(Array(MAXLFOS).fill('1'));
 
-    const [modCenterVals, setModCenterVals] = React.useState({ '1': {}, '2': {}, '3': {}, '4': {}, '5': {}, '6': {}});
+    const [modCenterVals, setModCenterVals] = React.useState({'1':{}, '2':{}, '3':{}, '4':{}});
 
     const [ticks, setTicks] = React.useState(0);
     const [beatsInMeasure, setBeatsInMeasure] = React.useState(4);
@@ -256,7 +242,7 @@ function MasterLfoHandler() {
         function handleTick(event) {
             let time = (Date.now() - firstUpdateTime) / 1000;
             let noiseData = {lastPhaseArr, setLastPhaseArr, cachedNoiseValueArr1, setCachedNoiseValueArr1, cachedNoiseValueArr2, setCachedNoiseValueArr2, noiseTypeArr};
-            operateModulators(modVisibleArr, modTypeArr, modInstanceNumArr, djParamArr, modCenterVals, freqArr, minArr, maxArr, shapeArr, initPhaseArr, noiseData, userDefinedWaves, userDefinedFunctions, userDefinedTypes, time, beatsInMeasure, ticks);
+            operateModulators(modVisibleArr, modTypeArr, modInstanceNumArr, djParamArr, modCenterVals, freqArr, minArr, maxArr, shapeArr, initPhaseArr, noiseData, userDefinedWave, time, beatsInMeasure, ticks);
         }
 
         function handleTimeSig(event) {
@@ -264,29 +250,13 @@ function MasterLfoHandler() {
         }
 
         function handleChangeUserWave(event){
-            userDefinedWaves[event.detail.index] = event.detail.points;
+            setUserDefinedWave(event.detail);
-            setUserDefinedWaves(userDefinedWaves);
-        }
-
-        function handleChangeUserFunction(event) {
-            userDefinedFunctions[event.detail.index] = event.detail.points;
-            setUserDefinedFunctions(userDefinedFunctions);
-        }
-
-        function handleChangeUserDefinedType(event) {
-            userDefinedTypes[event.detail.index - 1] = event.detail.type;
-            setUserDefinedTypes(userDefinedTypes);
         }
 
         function handleMaxTicks(event){
             setTicks(event.detail);
         }
 
-        function handleChangeViewMode(event){
-            setEnabled(true);
-            setViewMode(event.detail);
-        }
-
         function setNN(event){
             
             for (let i=0; i<MAXLFOS; i++){
@@ -354,10 +324,7 @@ function MasterLfoHandler() {
         window.addEventListener('enum', handleEnum);
         window.addEventListener('timesig', handleTimeSig);
         window.addEventListener('userWave', handleChangeUserWave);
-        window.addEventListener('userFunction', handleChangeUserFunction);
-        window.addEventListener('userDefinedType', handleChangeUserDefinedType);
         window.addEventListener('maxTicks', handleMaxTicks);
-        window.addEventListener('viewMode', handleChangeViewMode);
 
         return () => {
             window.removeEventListener('loadDict', handleLoad);
@@ -369,12 +336,9 @@ function MasterLfoHandler() {
             window.removeEventListener('enum', handleEnum);
             window.removeEventListener('timesig', handleTimeSig);
             window.removeEventListener('userWave', handleChangeUserWave);
-            window.removeEventListener('userFunction', handleChangeUserFunction);
-            window.removeEventListener('userDefinedType', handleChangeUserDefinedType);
             window.removeEventListener('maxTicks', handleMaxTicks);
-            window.removeEventListener('viewMode', handleChangeViewMode);
         };
-    }, [...allModArrays, ...allEnumArrays, ...allEnumMats, userDefinedWaves, userDefinedFunctions, userDefinedTypes, modCenterVals, render, beatsInMeasure, ticks]);
+    }, [...allModArrays, ...allEnumArrays, ...allEnumMats, userDefinedWave, modCenterVals, render, beatsInMeasure, ticks]);
 
 
     function CheckLinked(inst, param, checkInstArr, checkParamArr){
@@ -452,7 +416,6 @@ function MasterLfoHandler() {
                                 allModSetters[j](array);
                             }
                         }
-                        SendSaveEvent();
                         rerender(!render);
                         
                     }
@@ -462,7 +425,6 @@ function MasterLfoHandler() {
                         let newArr = modVisibleArr.slice();
                         newArr[id] = false;
                         setModVisibleArr(newArr);
-                        SendSaveEvent();
                     }
                     
                 }
@@ -486,15 +448,9 @@ function MasterLfoHandler() {
                 enumItems: enumItemCounts[i],
                 setEnumItemCounts: CreateParamChanger(enumItemCounts, setEnumItemCounts, i),
                 enumBreakPoints: enumBreakPoints,
-                setEnumBreakPoints: (val) => {
+                setEnumBreakPoints: setEnumBreakPoints,
-                    setEnumBreakPoints(val);
-                    SendSaveEvent
-                },
                 enumNames: enumNames,
-                setEnumNames: (val) => {
+                setEnumNames: setEnumNames,
-                    setEnumNames(val);
-                    SendSaveEvent
-                },
                 visible: enumVisibleArr[i],
                 djParam: enumDjParamArr[i],
                 setDjParam: CreateParamChanger(enumDjParamArr, setEnumDjParamArr, i),
@@ -540,7 +496,6 @@ function MasterLfoHandler() {
                             }
                         }
                         rerender(!render);
-                        SendSaveEvent();
                     }
                 },
                 removeEnum: () => {
@@ -548,7 +503,6 @@ function MasterLfoHandler() {
                         let newArr = enumVisibleArr.slice();
                         newArr[id] = false;
                         setEnumVisibleArr(newArr);
-                        SendSaveEvent();
                     }
                 }
             }, null)
@@ -557,19 +511,16 @@ function MasterLfoHandler() {
 
 
     var grid;
-    var modButtonClass;
+    var title;
-    var enumButtonClass;
     var labels;
     if (viewMode === ViewModes.MOD){
         grid = modContents;
-        modButtonClass = "highlighted-button";
+        title = "MODULATORS";
-        enumButtonClass = "unhighlighted-button";
         labels = MODULATORLABELS;
     }
     else {
         grid = enumContents;
-        modButtonClass = "unhighlighted-button";
+        title = "ENUMERATORS";
-        enumButtonClass = "highlighted-button";
         labels = ENUMERATORLABELS;
     }
 
@@ -582,22 +533,13 @@ function MasterLfoHandler() {
     }
 
     return e('div', null, 
-        e('div', { className: 'header' },
+        e('div', {className: 'container'}, 
-            e('div', {className: 'nav'}, 
+            e(Switch, {ontoggle: toggleViewMode}, null),
-                displayIfEnabled(e('button', { onClick: () => setViewMode(ViewModes.MOD), className: modButtonClass}, 'Modulators')),
+            e('span', {className: lockClass, onClick: toggleLockMode}, null)),
-                displayIfEnabled(e('button', { onClick: () => setViewMode(ViewModes.ENUM), className: enumButtonClass }, 'Enumerators'))
-            ),
-            e('button', { onClick: toggleEnabled, id: 'hide-button'}, toggleEnabledText),
         
-            //allows lock mode
+        e('h5', null, title),
-            //e('span', { className: lockClass, onClick: toggleLockMode }, null) 
+        e('ul', null, ...labels.map(x => ListItem(Label(x)))),
-        ),
+        e('div', {id: 'grid'}, ...grid)
-
-        displayIfEnabled(
-            e('table', { id: 'table' },
-            e('thead', null, e('tr', { id: 'headers' }, ...labels.map(x => e('th', {id: x == '# points' ? 'points' : x}, x)))),
-            e('tbody', null, ...grid)
-        ))
     );
 }
 
@@ -619,6 +561,7 @@ if (!DEBUG) {
     });
 
     window.max.bindInlet("param", (inst, paramName, val) => {
+        
         window.dispatchEvent(new CustomEvent('param', {'detail' : [inst, paramName, val]}));
     });
 
@@ -630,26 +573,10 @@ if (!DEBUG) {
         window.dispatchEvent(new CustomEvent('maxTicks', {'detail' : val}));
     });
 
-    window.max.bindInlet("userWave", (index, ...points) => {
+    window.max.bindInlet("userWave", (...points) => {
-        let data = { points, index };
+        window.dispatchEvent(new CustomEvent('userWave', {'detail' : points}));
-        window.dispatchEvent(new CustomEvent('userWave', { 'detail': data }));
     });
 
-    window.max.bindInlet("viewMode", (mode) => {
-        window.dispatchEvent(new CustomEvent('viewMode', { 'detail': parseInt(mode) }));
-    });
-
-    window.max.bindInlet("userFunction", (index, ...points) => {
-        //list of 101 points between 0-100
-        let data = { points, index };
-        window.dispatchEvent(new CustomEvent('userFunction', { 'detail': data }));
-    });
-
-    window.max.bindInlet("userDefinedType", (index, type) => {
-        let data = { index, type };
-        window.dispatchEvent(new CustomEvent('userDefinedType', { 'detail': data }));
-    })
-
     setInterval(() => {
         window.dispatchEvent(new CustomEvent('tick'));
     }, 200);

modulators.js

@@ -4,10 +4,10 @@
 
 
 var TYPEOPTIONS = ["LFO", "Noise"];
-var SHAPETYPES = ["Sine", "SawUp", "SawDown", "Tri", "Square", "Custom_1", "Custom_2", "Custom_3", "Custom_4"];
+var SHAPETYPES = ["Sine", "SawUp", "SawDown", "Tri", "Square", "Custom"];
 var NOISETYPES = ["Rand", "Line Int.", "Sine Int."]
 
-var INSTANCEOPTIONS = ["1", "2", "3", "4", "5", "6"];
+var INSTANCEOPTIONS = ["1", "2", "3", "4"];
 
 const MODPARAMOPTIONS = ["NONE", "stream", "pulse_length", "eventfulness", "event_length", "metriclarity", 
     "harmoniclarity", "melodic_cohesion", "melody_scope", "tonic_pitch", "pitch_center", "pitch_range", "dynamics",
@@ -22,9 +22,7 @@ function ControlType(){
     return e('select', {className: 'control-type'}, Option("LFO"));
 }
 
-function DataCell(element) {
+
-    return e('td', null, element);
-}
 
 function LfoRow(props){
 
@@ -36,42 +34,34 @@ function LfoRow(props){
     let typeOption = null;
 
     if (props.type == "LFO"){
-        typeOption = DataCell(DropDown({locked:props.locked, onChange: props.setShape, value:props.shape, options: SHAPETYPES}));
+        typeOption = ListItem(DropDown({locked:props.locked, onChange: props.setShape, value:props.shape, options: SHAPETYPES}));
     }
     else if (props.type == "Noise"){
-        typeOption = DataCell(DropDown({locked:props.locked, onChange: props.setNoise, value:props.noise, options: NOISETYPES}));
+        typeOption = ListItem(DropDown({locked:props.locked, onChange: props.setNoise, value:props.noise, options: NOISETYPES}));
     }
 
-    let content = e('tr', {className: 'lfo-item'},
+    let content = e('ul', {className: 'lfo-item'},
-        DataCell(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})),  
+        ListItem(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})),  
-        DataCell(DropDown({locked:props.locked, options: TYPEOPTIONS, onChange: props.setType, value:props.type})), 
+        ListItem(DropDown({locked:props.locked, options: TYPEOPTIONS, onChange: props.setType, value:props.type})), 
         typeOption,
-        DataCell(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
+        ListItem(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
-        DataCell(e("input", {onChange:props.setFreq, value:props.freq, className:"timeInput"}, null)), 
+        ListItem(e("input", {onChange:props.setFreq, value:props.freq, className:"timeInput"}, null)), 
-        DataCell(e(NumberBox, {onChange:props.setMin, value:props.min, step:0.1}, null)),
+        ListItem(e(NumberBox, {onChange:props.setMin, value:props.min, step:0.1}, null)),
-        DataCell(e(NumberBox, {onChange:props.setMax, value:props.max, step:0.1}, null)),
+        ListItem(e(NumberBox, {onChange:props.setMax, value:props.max, step:0.1}, null)),
-        //DataCell(e(NumberBox, {onChange:props.setAmp, value:props.amp, step:0.1}, null)), 
+        //ListItem(e(NumberBox, {onChange:props.setAmp, value:props.amp, step:0.1}, null)), 
-        DataCell(e(NumberBox, {onChange:props.setPhase, value:props.phase, step:0.1}, null)), 
+        ListItem(e(NumberBox, {onChange:props.setPhase, value:props.phase, step:0.1}, null)), 
-        DataCell(e("div", {className:"base-val"}, center.toString())),
+        ListItem(e("div", {className:"base-val"}, center.toString())),
-        DataCell(e("input", {type: 'range', min: 0, max: 1, step: 0.01, readonly: true, id: `slider-${props.instanceNum}-${props.djParam}`})),
+        ListItem(e("input", {type: 'range', min: 0, max: 1, step: 0.01, readonly: true, id: `slider-${props.instanceNum}-${props.djParam}`})),
-        DataCell(e(Button, {text:'+', onClick: props.addLfo, locked: props.locked}, null)), 
+        ListItem(e(Button, {text:'+', onClick: props.addLfo, locked: props.locked}, null)), 
-        DataCell(e(Button, {text:'-', onClick: props.removeLfo, locked: props.locked}, null)),
+        ListItem(e(Button, {text:'-', onClick: props.removeLfo, locked: props.locked}, null)),
-        DataCell(e("div", {className:"linked"}, linkedText)),
+        ListItem(e("div", {className:"linked"}, linkedText)),
     );
     if (props.visible){
-        return content;
+        return content
     };
 }
 
-function indexUserWave(phase, index, userDefinedWaves){
+function indexWave(type, phase, userDefinedWave){
-    return parseFloat(userDefinedWaves[index][Math.floor(phase * 50)]) / 127;
-}
-
-function indexUserFunction(phase, index, userDefinedFunctions){
-    return parseFloat(userDefinedFunctions[index][Math.floor(phase * 101)]) / 127;
-}
-
-function indexWave(type, phase, userDefinedWaves, userDefinedFunctions, userDefinedTypes){
     switch (type){
         case "Sine":
             return (Math.sin(phase * Math.PI * 2) / 2) + 0.5;
@@ -83,18 +73,12 @@ function indexWave(type, phase, userDefinedWaves, userDefinedFunctions, userDefi
             return phase > 0.5? (1-phase) * 2 : phase * 2;
         case "Square":
             return +(phase > 0.5);
-        case "Custom_1":
+        case "Custom":
-            return userDefinedTypes[0] == 0 ? indexUserWave(phase, 1, userDefinedWaves) : indexUserFunction(phase, 1, userDefinedFunctions);
+            return parseFloat(userDefinedWave[Math.floor(phase * 50)]) / 127
-        case "Custom_2":
-            return userDefinedTypes[1] == 0 ? indexUserWave(phase, 2, userDefinedWaves) : indexUserFunction(phase, 2, userDefinedFunctions);
-        case "Custom_3":
-            return userDefinedTypes[2] == 0 ? indexUserWave(phase, 3, userDefinedWaves) : indexUserFunction(phase, 3, userDefinedFunctions);
-        case "Custom_4":
-            return userDefinedTypes[3] == 0 ? indexUserWave(phase, 4, userDefinedWaves) : indexUserFunction(phase, 4, userDefinedFunctions);
     }
 }
 
-function operateModulators(visibleArr, typeArr, instanceNumArr, paramNames, centers, freqs, mins, maxs, waveTypes, phaseArr, noiseData, userDefinedWaves, userDefinedFunctions, userDefinedTypes, currTime, beatsInMeasure, ticks){
+function operateModulators(visibleArr, typeArr, instanceNumArr, paramNames, centers, freqs, mins, maxs, waveTypes, phaseArr, noiseData, userDefinedWave, currTime, beatsInMeasure, ticks){
     for (let i=0; i<paramNames.length; i++){
         if (visibleArr[i]){
             
@@ -108,7 +92,7 @@ function operateModulators(visibleArr, typeArr, instanceNumArr, paramNames, cent
             let output = 0;
             
             if (typeArr[i] == "LFO")
-                output = operateLFO(center, inst, freqs[i], mins[i], maxs[i], waveTypes[i], phaseArr, i, userDefinedWaves, userDefinedFunctions, userDefinedTypes, name, currTime, beatsInMeasure, ticks);
+                output = operateLFO(center, inst, freqs[i], mins[i], maxs[i], waveTypes[i], phaseArr, i, userDefinedWave, name, currTime, beatsInMeasure, ticks);
             else
                 output = operateNoise(center, inst, freqs[i], mins[i], maxs[i], waveTypes[i], phaseArr, i, name, noiseData, currTime, beatsInMeasure, ticks);
             if (name !== "NONE")
@@ -117,7 +101,7 @@ function operateModulators(visibleArr, typeArr, instanceNumArr, paramNames, cent
     }
 }
 
-function operateLFO(center, inst, timeBaseStr, min, max, waveType, phaseArr, phaseIndex, userDefinedWaves, userDefinedFunctions, userDefinedTypes, name, currTime, beatsInMeasure, maxTicks){
+function operateLFO(center, inst, timeBaseStr, min, max, waveType, phaseArr, phaseIndex, userDefinedWave, name, currTime, beatsInMeasure, maxTicks){
     let amp = parseFloat(max) - parseFloat(min);
     let phaseType;
     let timeBase;
@@ -129,7 +113,7 @@ function operateLFO(center, inst, timeBaseStr, min, max, waveType, phaseArr, pha
         phase = (currTime * timeBase + parseFloat(phaseArr[phaseIndex])) % 1.00;
     else if (phaseType === PhaseTypes.MUSICAL)
         phase = (maxTicks % timeBase) / timeBase;
-    let unscaled = indexWave(waveType, phase, userDefinedWaves, userDefinedFunctions, userDefinedTypes);
+    let unscaled = indexWave(waveType, phase, userDefinedWave);
     syncDisplay(inst, name, unscaled);
     
     return  unscaled * amp + center + parseFloat(min);
@@ -158,6 +142,9 @@ function operateNoise(center, inst, timeBaseStr, min, max, waveType, phaseArr, i
     else if (phaseType === PhaseTypes.MUSICAL)
         phase = (maxTicks % timeBase) / timeBase;
 
+    
+
+    
     if (noiseData.cachedNoiseValueArr1[index] == 0 || noiseData.lastPhaseArr[index] > phase){ // occurs if the phase reset to 0 or at the very start
 
         noiseData.cachedNoiseValueArr2[index] = noiseData.cachedNoiseValueArr1[index];
@@ -171,11 +158,13 @@ function operateNoise(center, inst, timeBaseStr, min, max, waveType, phaseArr, i
     noiseData.lastPhaseArr[index] = phase;
     noiseData.setLastPhaseArr(noiseData.lastPhaseArr);
 
+
     //let unscaled = (noiseData.cachedNoiseValueArr[index][1] - noiseData.cachedNoiseValueArr[index][0]) * sinePhase + noiseData.cachedNoiseValueArr[index][0];
     let unscaled = interpolateNoise(noiseType, noiseData.cachedNoiseValueArr1[index], noiseData.cachedNoiseValueArr2[index], phase);
     syncDisplay(inst, name, unscaled);
     
     return  unscaled * amp + center + parseFloat(min);
+
 }
 
 function interpolateNoise(type, cachedVal1, cachedVal2, phase){