dispatch(
parameterUpdated({
diff --git a/src/features/timbre/parameters/Mixer.js b/src/features/timbre/parameters/Mixer.js
index ffe5fa2..398c16c 100644
--- a/src/features/timbre/parameters/Mixer.js
+++ b/src/features/timbre/parameters/Mixer.js
@@ -11,6 +11,8 @@ export default function Mixer(props) {
return (
dispatch(
@@ -22,6 +24,8 @@ export default function Mixer(props) {
}
/>
dispatch(
@@ -33,6 +37,9 @@ export default function Mixer(props) {
}
/>
dispatch(
diff --git a/src/features/timbre/parameters/Parameters.module.css b/src/features/timbre/parameters/Parameters.module.css
index 4a4b478..b7dcff4 100644
--- a/src/features/timbre/parameters/Parameters.module.css
+++ b/src/features/timbre/parameters/Parameters.module.css
@@ -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;
}
diff --git a/src/features/timbre/parameters/Pitch.js b/src/features/timbre/parameters/Pitch.js
index a83d365..52eed40 100644
--- a/src/features/timbre/parameters/Pitch.js
+++ b/src/features/timbre/parameters/Pitch.js
@@ -36,8 +36,8 @@ export default function Pitch(props) {
/>
dispatch(
parameterUpdated({
@@ -49,8 +49,8 @@ export default function Pitch(props) {
/>
dispatch(
parameterUpdated({
@@ -62,8 +62,8 @@ export default function Pitch(props) {
/>
dispatch(
parameterUpdated({
@@ -75,8 +75,8 @@ export default function Pitch(props) {
/>
dispatch(
parameterUpdated({
@@ -88,8 +88,8 @@ export default function Pitch(props) {
/>
dispatch(
parameterUpdated({
@@ -101,8 +101,8 @@ export default function Pitch(props) {
/>
dispatch(
parameterUpdated({
diff --git a/src/features/timbre/parameters/VCO.js b/src/features/timbre/parameters/VCO.js
index 744e353..3f1e67e 100644
--- a/src/features/timbre/parameters/VCO.js
+++ b/src/features/timbre/parameters/VCO.js
@@ -38,8 +38,8 @@ export default function VCO(props) {
/>
Waveform Mod
dispatch(
@@ -52,8 +52,8 @@ export default function VCO(props) {
/>
LFO Mod
dispatch(
diff --git a/src/features/timbre/parameters/parameterSlice.js b/src/features/timbre/parameters/parameterSlice.js
index f4a223c..83dc198 100644
--- a/src/features/timbre/parameters/parameterSlice.js
+++ b/src/features/timbre/parameters/parameterSlice.js
@@ -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: {
diff --git a/src/features/timbre/timbreSlice.js b/src/features/timbre/timbreSlice.js
new file mode 100644
index 0000000..3e0dd1a
--- /dev/null
+++ b/src/features/timbre/timbreSlice.js
@@ -0,0 +1,55 @@
+import { createSlice, createEntityAdapter } from '@reduxjs/toolkit';
+
+const timbreAdapter = createEntityAdapter({});
+
+const timbreSlice = createSlice({
+ name: 'timbre',
+ initialState: timbreAdapter.getInitialState({
+ ids: ['timbre1', 'timbre2', 'vocoder', 'effects', 'arpeggiator'],
+ entities: {
+ 'timbre1': {
+ id: 'timbre1',
+ vco1: 'vco1',
+ vco2: 'vco2',
+ mixer: 'mixer1',
+ pitch: 'pitch1',
+ filter: 'filter1',
+ eg1: 'eg1',
+ amp: 'amp1',
+ eg2: 'eg2',
+ lfo1: 'lfo1',
+ lfo2: 'lfo2',
+ patches: 'patches1',
+ },
+ 'timbre2': {
+ id: 'timbre2',
+ vco1: 'vco3',
+ vco2: 'vco4',
+ mixer: 'mixer2',
+ pitch: 'pitch2',
+ filter: 'filter2',
+ eg1: 'eg3',
+ amp: 'amp2',
+ eg2: 'eg4',
+ lfo1: 'lfo3',
+ lfo2: 'lfo4',
+ patches: 'patches2',
+ },
+ },
+ }),
+ reducers: {
+ timbreAdded: timbreAdapter.addOne,
+ timbreUpdated: timbreAdapter.updateOne,
+ },
+});
+
+export const {
+ selectById,
+ selectAll,
+ selectEntities,
+ selectIds,
+} = timbreAdapter.getSelectors((state) => state.timbres);
+
+export const { timbreAdded, timbreUpdated } = timbreSlice.actions;
+
+export default timbreSlice.reducer;