Squashed commit of the following:

commit 822f2d6527d161a29ed9d2603ae73c416ec04c37
Author: [poww10s] <[theironminer@gmail.com]>
Date:   Thu Nov 19 15:33:17 2020 -0500

    Squashed commit of the following:

    commit 8853f3122e77188a987b5a2585fc61aa137fddab
    Author: [poww10s] <[theironminer@gmail.com]>
    Date:   Thu Nov 19 15:24:23 2020 -0500

        Squashed commit of the following:

        commit 47b74abadfd125b90c883d43786149a51bb7cdba
        Author: [poww10s] <[theironminer@gmail.com]>
        Date:   Thu Nov 19 14:15:03 2020 -0500

            custom rc-slider style and include

        commit b2d1161cbc7eabb6a2c512606b66104084c25754
        Author: [poww10s] <[theironminer@gmail.com]>
        Date:   Thu Nov 19 14:14:45 2020 -0500

            include rc-slider package

    commit fca611edc959935b09dcd70cfaa737680f22d559
    Author: [poww10s] <[theironminer@gmail.com]>
    Date:   Thu Nov 19 03:09:47 2020 -0500

        add styled-components

commit 86bec44f1ea5f631107aad0c561a5788728946c8
Author: [poww10s] <[theironminer@gmail.com]>
Date:   Thu Nov 19 01:13:09 2020 -0500

    added timbre2 to App

commit d1c275b9915861fde8ca9225e5dcb591c707949d
Author: [poww10s] <[theironminer@gmail.com]>
Date:   Thu Nov 19 01:13:00 2020 -0500

    updated parameterSlice with correct ID's

commit 3e694c135722c4c63c489e6c2691b18fea4f977a
Author: [poww10s] <[theironminer@gmail.com]>
Date:   Thu Nov 19 01:12:30 2020 -0500

    added timbre reducer to store

commit 251693a3fd35aca039de51dda79a17e4154afb89
Author: [poww10s] <[theironminer@gmail.com]>
Date:   Thu Nov 19 01:12:11 2020 -0500

    added support for seperate timbres

commit a2b24c1e6f7cf1b95bfeffb828418319932658ec
Author: [poww10s] <[theironminer@gmail.com]>
Date:   Thu Nov 19 01:11:54 2020 -0500

    added timbreSlice
This commit is contained in:
[poww10s]
2020-11-19 15:33:42 -05:00
parent fcf45a690c
commit 0f8991695f
17 changed files with 881 additions and 77 deletions
+6 -6
View File
@@ -12,8 +12,8 @@ export default function Amp(props) {
<div className={styles.container}>
<Slider
parameter={parameters.ampLevel}
min="0"
max="127"
min={0}
max={127}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -25,8 +25,8 @@ export default function Amp(props) {
/>
<Slider
parameter={parameters.panpot}
min="-63"
max="63"
min={-63}
max={63}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -38,8 +38,8 @@ export default function Amp(props) {
/>
<Slider
parameter={parameters.ampTrack}
min="-63"
max="63"
min={-63}
max={63}
onChange={(value) =>
dispatch(
parameterUpdated({
+8 -8
View File
@@ -12,8 +12,8 @@ export default function EG(props) {
<div className={styles.container}>
<Slider
parameter={parameters.attack}
min="0"
max="127"
min={0}
max={127}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -25,8 +25,8 @@ export default function EG(props) {
/>
<Slider
parameter={parameters.decay}
min="0"
max="127"
min={0}
max={127}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -38,8 +38,8 @@ export default function EG(props) {
/>
<Slider
parameter={parameters.sustain}
min="0"
max="127"
min={0}
max={127}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -51,8 +51,8 @@ export default function EG(props) {
/>
<Slider
parameter={parameters.release}
min="0"
max="127"
min={0}
max={127}
onChange={(value) =>
dispatch(
parameterUpdated({
+8 -8
View File
@@ -29,8 +29,8 @@ export default function Filter(props) {
/>
<Slider
parameter={parameters.cutoff}
min="0"
max="127"
min={0}
max={127}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -42,8 +42,8 @@ export default function Filter(props) {
/>
<Slider
parameter={parameters.resonance}
min="0"
max="127"
min={0}
max={127}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -55,8 +55,8 @@ export default function Filter(props) {
/>
<Slider
parameter={parameters.egIntensity}
min="-63"
max="63"
min={-63}
max={63}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -68,8 +68,8 @@ export default function Filter(props) {
/>
<Slider
parameter={parameters.keyboardTrack}
min="-63"
max="63"
min={-63}
max={63}
onChange={(value) =>
dispatch(
parameterUpdated({
+7
View File
@@ -11,6 +11,8 @@ export default function Mixer(props) {
return (
<div className={styles.container}>
<Slider
min={0}
max={127}
parameter={parameters.vol1}
onChange={(value) =>
dispatch(
@@ -22,6 +24,8 @@ export default function Mixer(props) {
}
/>
<Slider
min={0}
max={127}
parameter={parameters.vol2}
onChange={(value) =>
dispatch(
@@ -33,6 +37,9 @@ export default function Mixer(props) {
}
/>
<Slider
className={styles.slider}
min={0}
max={127}
parameter={parameters.vol3}
onChange={(value) =>
dispatch(
@@ -6,10 +6,9 @@
padding: 10pt;
margin: 2pt;
border: solid 1pt black;
width: 120px;
flex-basis: 100%;
}
.container > input {
margin: 7pt 0;
}
.container > select {
.container > * {
margin: 2.5pt 0;
}
+12 -12
View File
@@ -36,8 +36,8 @@ export default function Pitch(props) {
/>
<Slider
parameter={parameters.transpose}
min="-24"
max="24"
min={-24}
max={24}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -49,8 +49,8 @@ export default function Pitch(props) {
/>
<Slider
parameter={parameters.tune}
min="-50"
max="50"
min={-50}
max={50}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -62,8 +62,8 @@ export default function Pitch(props) {
/>
<Slider
parameter={parameters.unisonDetune}
min="0"
max="99"
min={0}
max={99}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -75,8 +75,8 @@ export default function Pitch(props) {
/>
<Slider
parameter={parameters.portamento}
min="0"
max="127"
min={0}
max={127}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -88,8 +88,8 @@ export default function Pitch(props) {
/>
<Slider
parameter={parameters.bendRange}
min="-12"
max="12"
min={-12}
max={12}
onChange={(value) =>
dispatch(
parameterUpdated({
@@ -101,8 +101,8 @@ export default function Pitch(props) {
/>
<Slider
parameter={parameters.vibratoIntensity}
min="-63"
max="63"
min={-63}
max={63}
onChange={(value) =>
dispatch(
parameterUpdated({
+4 -4
View File
@@ -38,8 +38,8 @@ export default function VCO(props) {
/>
Waveform Mod
<Slider
min="0"
max="100"
min={0}
max={100}
parameter={parameters.waveMod}
onChange={(value) =>
dispatch(
@@ -52,8 +52,8 @@ export default function VCO(props) {
/>
LFO Mod
<Slider
min="0"
max="100"
min={0}
max={100}
parameter={parameters.lfoMod}
onChange={(value) =>
dispatch(
@@ -9,7 +9,7 @@ const parametersSlice = createSlice({
'vco1',
'vco2',
'mixer1',
'timbre1',
'pitch1',
'filter1',
'eg1',
'amp1',
@@ -17,6 +17,17 @@ const parametersSlice = createSlice({
'lfo1',
'lfo2',
'patches1',
'vco3',
'vco4',
'mixer2',
'pitch2',
'filter2',
'eg3',
'amp2',
'eg4',
'lfo3',
'lfo4',
'patches2',
],
entities: {
'vco1': {
@@ -33,12 +44,32 @@ const parametersSlice = createSlice({
waveMod: 0,
lfoMod: 0,
},
'vco3': {
id: 'vco3',
waveform: 'Sine',
dwgsOrModType: 0,
waveMod: 100,
lfoMod: 0,
},
'vco4': {
id: 'vco4',
waveform: 'Triangle',
dwgsOrModType: 0,
waveMod: 0,
lfoMod: 100,
},
'mixer1': {
id: 'mixer1',
vol1: 127,
vol2: 0,
vol3: 0,
},
'mixer2': {
id: 'mixer2',
vol1: 127,
vol2: 0,
vol3: 0,
},
'pitch1': {
id: 'pitch1',
voiceAssign: 'Mono',
@@ -50,6 +81,17 @@ const parametersSlice = createSlice({
bendRange: 0,
vibratoIntensity: 0,
},
'pitch2': {
id: 'pitch2',
voiceAssign: 'Mono',
triggerMode: 'Single',
transpose: 0,
tune: 0,
unisonDetune: 0,
portamento: 0,
bendRange: 0,
vibratoIntensity: 0,
},
'filter1': {
id: 'filter1',
filterType: '-24db Low Pass',
@@ -58,6 +100,14 @@ const parametersSlice = createSlice({
egIntensity: 0,
keyboardTrack: 0,
},
'filter2': {
id: 'filter2',
filterType: '-24db Low Pass',
cutoff: 0,
resonance: 0,
egIntensity: 0,
keyboardTrack: 0,
},
'eg1': {
id: 'eg1',
attack: 0,
@@ -81,6 +131,29 @@ const parametersSlice = createSlice({
release: 0,
egReset: true,
},
'eg3': {
id: 'eg3',
attack: 0,
decay: 0,
sustain: 127,
release: 0,
egReset: false,
},
'amp2': {
id: 'amp2',
ampLevel: 127,
panpot: 0,
ampTrack: 0,
distortion: false,
},
'eg4': {
id: 'eg4',
attack: 0,
decay: 0,
sustain: 127,
release: 0,
egReset: true,
},
'lfo1': {
id: 'lfo1',
waveform: 'Saw',
@@ -95,6 +168,20 @@ const parametersSlice = createSlice({
tempoSync: false,
frequency: 0,
},
'lfo3': {
id: 'lfo3',
waveform: 'Saw',
keySync: 'Off',
tempoSync: false,
frequency: 0,
},
'lfo4': {
id: 'lfo4',
waveform: 'Saw',
keySync: 'Off',
tempoSync: false,
frequency: 0,
},
},
}),
reducers: {