shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add units to MIDI range control"

Browse Source 
This reverts commit 8b1f52eca9.
This commit is contained in:
Robin E.R. Davies
2026-06-02 01:15:59 -04:00
parent d346cb05a9
commit 63d0ddaea9
2 changed files with 9 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vite/src/pipedal/MidiBindingView.tsx
+9 -64
View File
@@ -25,7 +25,7 @@ import { withStyles } from "tss-react/mui";
import { createStyles } from './WithStyles';
import Snackbar from '@mui/material/Snackbar';
import { UiPlugin, UiControl } from './Lv2Plugin';
import { UiPlugin } from './Lv2Plugin';
import MenuItem from '@mui/material/MenuItem';
import Select from '@mui/material/Select';
@@ -96,7 +96,6 @@ interface MidiBindingViewProps extends WithStyles<typeof styles> {
midiBinding: MidiBinding;
midiControlType: MidiControlType;
canDoTapTempo: boolean;
uiControl?: UiControl;
onChange: (instanceId: number, newBinding: MidiBinding) => void;
}
@@ -190,53 +189,14 @@ const MidiBindingView =
}
handleMinChange(value: number): void {
let newBinding = this.props.midiBinding.clone();
newBinding.minValue = this.realToMidi(value);
newBinding.minValue = value;
this.props.onChange(this.props.instanceId, newBinding);
}
handleMaxChange(value: number): void {
let newBinding = this.props.midiBinding.clone();
newBinding.maxValue = this.realToMidi(value);
newBinding.maxValue = value;
this.props.onChange(this.props.instanceId, newBinding);
}
private realToMidi(realValue: number): number {
let control = this.props.uiControl;
if (!control) return realValue;
let range = control.max_value - control.min_value;
if (range === 0) return 0;
return (realValue - control.min_value) / range;
}
private midiToReal(midiValue: number): number {
let control = this.props.uiControl;
if (!control) return midiValue;
return midiValue * (control.max_value - control.min_value) + control.min_value;
}
private getDisplayUnit(): string {
let control = this.props.uiControl;
if (!control) return "";
if (control.custom_units !== "") {
return control.custom_units.replace("%f", "");
}
switch (control.units) {
case "bar": return " bar";
case "beat": return " beats";
case "bpm": return " bpm";
case "cent": return " cents";
case "cm": return " cm";
case "db": return " dB";
case "hz": return " Hz";
case "khz": return " kHz";
case "km": return " km";
case "m": return " m";
case "mhz": return " MHz";
case "midiNote": return "MIDI note";
case "min": return " min";
case "ms": return " ms";
case "pc": return " %";
case "s": return " s";
case "semitone12TET": return " st";
default: return "";
}
}
handleCtlMinChange(value: number): void {
let newBinding = this.props.midiBinding.clone();
newBinding.minControlValue = Math.round(value);
@@ -678,36 +638,21 @@ const MidiBindingView =
)
}
{
showLinearRange && (() => {
let uiControl = this.props.uiControl;
let displayMin = uiControl ? uiControl.min_value : 0;
let displayMax = uiControl ? uiControl.max_value : 1;
let unit = this.getDisplayUnit();
let isInteger = uiControl?.integer_property ?? false;
return (
showLinearRange && (
<div style={{ display: "flex", flexFlow: "row wrap", alignItems: "center" }}>
<div className={classes.controlDiv}>
<Typography noWrap display="inline">Min Val:&nbsp;</Typography>
<NumericInput value={this.midiToReal(midiBinding.minValue)} ariaLabel='min'
min={displayMin} max={displayMax} integer={isInteger}
onChange={(value) => { this.handleMinChange(value); }}
<NumericInput value={midiBinding.minValue} ariaLabel='min'
min={0} max={1} onChange={(value) => { this.handleMinChange(value); }}
/>
{unit !== "" && (
<Typography noWrap display="inline">&nbsp;{unit.trim()}</Typography>
)}
</div>
<div className={classes.controlDiv}>
<Typography noWrap display="inline">Max Val:&nbsp;</Typography>
<NumericInput value={this.midiToReal(midiBinding.maxValue)} ariaLabel='max'
min={displayMin} max={displayMax} integer={isInteger}
onChange={(value) => { this.handleMaxChange(value); }} />
{unit !== "" && (
<Typography noWrap display="inline">&nbsp;{unit.trim()}</Typography>
)}
<NumericInput value={midiBinding.maxValue} ariaLabel='max'
min={0} max={1} onChange={(value) => { this.handleMaxChange(value); }} />
</div>
</div>
);
})()
)
}
{
canRotaryScale && (
vite/src/pipedal/MidiBindingsDialog.tsx
-2
View File
@@ -214,7 +214,6 @@ export const MidiBindingDialog =
midiControlType={ getMidiControlType(plugin, "__bypass")
}
canDoTapTempo={false }
uiControl={plugin.getControl("__bypass")}
onChange={(instanceId: number, newItem: MidiBinding) => this.handleItemChanged(instanceId, newItem)}
/>
</td>
@@ -259,7 +258,6 @@ export const MidiBindingDialog =
midiControlType={getMidiControlType(plugin, symbol)}
midiBinding={item.getMidiBinding(symbol)}
canDoTapTempo={canDoTapTempo(plugin, symbol)}
uiControl={control}
onChange={(instanceId: number, newItem: MidiBinding) => this.handleItemChanged(instanceId, newItem)}
/>
</td>