cvancau/alapatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finish merging changes from v2-styling-react-select

Browse Source
This commit is contained in:
[poww10s]
2020-11-19 22:19:32 -05:00
parent 2c1e3f5b1f
commit 0417460bf9
4 changed files with 0 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/features/timbre/parameters/Pitch.js
-106
View File
@@ -9,111 +9,6 @@ export default function Pitch(props) {
const dispatch = useDispatch();
return (
<<<<<<< HEAD
<div className={styles.container}>
<SelectList
value={parameters.voiceAssign}
list={['Mono', 'Poly', 'Unison']}
onChange={(value) =>
dispatch(
parameterUpdated({
id: props.id,
changes: { voiceAssign: value },
})
)
}
/>
<SelectList
value={parameters.triggerMode}
list={['Single', 'Multiple']}
onChange={(value) =>
dispatch(
parameterUpdated({
id: props.id,
changes: { triggerMode: value },
})
)
}
/>
<Slider
parameter={parameters.transpose}
min={-24}
max={24}
onChange={(value) =>
dispatch(
parameterUpdated({
id: props.id,
changes: { transpose: value },
})
)
}
/>
<Slider
parameter={parameters.tune}
min={-50}
max={50}
onChange={(value) =>
dispatch(
parameterUpdated({
id: props.id,
changes: { tune: value },
})
)
}
/>
<Slider
parameter={parameters.unisonDetune}
min={0}
max={99}
onChange={(value) =>
dispatch(
parameterUpdated({
id: props.id,
changes: { unisonDetune: value },
})
)
}
/>
<Slider
parameter={parameters.portamento}
min={0}
max={127}
onChange={(value) =>
dispatch(
parameterUpdated({
id: props.id,
changes: { portamento: value },
})
)
}
/>
<Slider
parameter={parameters.bendRange}
min={-12}
max={12}
onChange={(value) =>
dispatch(
parameterUpdated({
id: props.id,
changes: { bendRange: value },
})
)
}
/>
<Slider
parameter={parameters.vibratoIntensity}
min={-63}
max={63}
onChange={(value) =>
dispatch(
parameterUpdated({
id: props.id,
changes: { vibratoIntensity: value },
})
)
}
/>
=======
<div className={styles.pitchContainer}>
<div className={styles.container}>
Voice Assign
@@ -234,7 +129,6 @@ export default function Pitch(props) {
}
/>
</div>
>>>>>>> v2-styling-react-select
</div>
);
}
src/features/timbre/parameters/parameterSlice.js
-8
View File
@@ -47,22 +47,14 @@ const parametersSlice = createSlice({
'vco3': {
id: 'vco3',
waveform: 'Sine',
<<<<<<< HEAD
dwgsOrModType: 0,
=======
dwgsOrModType: 'SynWave1',
>>>>>>> v2-styling-react-select
waveMod: 100,
lfoMod: 0,
},
'vco4': {
id: 'vco4',
waveform: 'Triangle',
<<<<<<< HEAD
dwgsOrModType: 0,
=======
dwgsOrModType: 'Off',
>>>>>>> v2-styling-react-select
waveMod: 0,
lfoMod: 100,
},