Disable traces of experimental MIDI UI.
This commit is contained in:
@@ -607,7 +607,7 @@ namespace pipedal
|
||||
if (!obj) {
|
||||
write_raw("null");
|
||||
} else {
|
||||
write(obj.get());
|
||||
write(obj.value());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -520,6 +520,7 @@ JSON_MAP_BEGIN(PedalboardItem)
|
||||
JSON_MAP_REFERENCE_CONDITIONAL(PedalboardItem,topChain,IsPedalboardSplitItem)
|
||||
JSON_MAP_REFERENCE_CONDITIONAL(PedalboardItem,bottomChain,&IsPedalboardSplitItem)
|
||||
JSON_MAP_REFERENCE(PedalboardItem,midiBindings)
|
||||
JSON_MAP_REFERENCE(PedalboardItem,midiChannelBinding)
|
||||
JSON_MAP_REFERENCE(PedalboardItem,stateUpdateCount)
|
||||
JSON_MAP_REFERENCE(PedalboardItem,lv2State)
|
||||
JSON_MAP_REFERENCE(PedalboardItem,lilvPresetUri)
|
||||
|
||||
+12
-12
@@ -81,7 +81,7 @@ public:
|
||||
|
||||
};
|
||||
|
||||
class PedalboardItem: public JsonMemberWritable {
|
||||
class PedalboardItem {
|
||||
public:
|
||||
using PropertyMap = std::map<std::string,atom_object>;
|
||||
int64_t instanceId_ = 0;
|
||||
@@ -148,17 +148,17 @@ public:
|
||||
void AddResetsForMissingProperties(Snapshot&snapshot, size_t*index) const;
|
||||
|
||||
|
||||
virtual void write_members(json_writer&writer) const {
|
||||
writer.write_member("instanceId",instanceId_);
|
||||
writer.write_member("uri",uri_);
|
||||
writer.write_member("pluginName",pluginName_);
|
||||
writer.write_member("isEnabled",isEnabled_);
|
||||
if (isSplit())
|
||||
{
|
||||
writer.write_member("topChain",topChain_);
|
||||
writer.write_member("bottomChain",bottomChain_);
|
||||
}
|
||||
}
|
||||
// virtual void write_members(json_writer&writer) const {
|
||||
// writer.write_member("instanceId",instanceId_);
|
||||
// writer.write_member("uri",uri_);
|
||||
// writer.write_member("pluginName",pluginName_);
|
||||
// writer.write_member("isEnabled",isEnabled_);
|
||||
// if (isSplit())
|
||||
// {
|
||||
// writer.write_member("topChain",topChain_);
|
||||
// writer.write_member("bottomChain",bottomChain_);
|
||||
// }
|
||||
// }
|
||||
|
||||
DECLARE_JSON_MAP(PedalboardItem);
|
||||
};
|
||||
|
||||
@@ -39,3 +39,6 @@ pcm.pipedal_aux_in {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
[{\"message\":\"updateCurrentPedalboard\"},{\"clientId\":6,\"pedalboard\":{\"name\":\"Test\",\"input_volume_db\":0,\"output_volume_db\":0,\"items\":[{\"instanceId\":51,\"title\":\"\",\"isEnabled\":true,\"uri\":\"uri://two-play/pipedal/pedalboard#Empty\",\"pluginName\":\"\",\"controlValues\":[],\"midiBindings\":[],\"midiChannelBinding\":null,\"vstState\":\"\",\"stateUpdateCount\":0,\"lv2State\":[false,{}],\"lilvPresetUri\":\"\",\"pathProperties\":{}},{\"instanceId\":50,\"title\":\"\",\"isEnabled\":true,\"uri\":\"http://calf.sourceforge.net/plugins/Gate\",\"pluginName\":\"Calf Gate\",\"controlValues\":[{\"key\":\"bypass\",\"value\":0},{\"key\":\"level_in\",\"value\":1},{\"key\":\"meter_in\",\"value\":0},{\"key\":\"meter_out\",\"value\":0},{\"key\":\"clip_in\",\"value\":0},{\"key\":\"clip_out\",\"value\":0},{\"key\":\"range\",\"value\":0.0612500012},{\"key\":\"threshold\",\"value\":0.125},{\"key\":\"ratio\",\"value\":2},{\"key\":\"attack\",\"value\":20},{\"key\":\"release\",\"value\":250},{\"key\":\"makeup\",\"value\":1},{\"key\":\"knee\",\"value\":2.82842994},{\"key\":\"detection\",\"value\":0},{\"key\":\"stereo_link\",\"value\":0},{\"key\":\"gating\",\"value\":0.03125}],\"midiBindings\":[],\"midiChannelBinding\":{\"deviceSelection\":0,\"midiDevices\":[],\"channel\":-1,\"acceptProgramChanges\":true,\"acceptCommonMessages\":true},\"vstState\":\"\",\"stateUpdateCount\":0,\"lv2State\":[false,{}],\"lilvPresetUri\":\"\",\"pathProperties\":{}},{\"instanceId\":46,\"title\":\"\",\"isEnabled\":true,\"uri\":\"uri://two-play/pipedal/pedalboard#Empty\",\"pluginName\":\"\",\"controlValues\":[],\"midiBindings\":[],\"midiChannelBinding\":null,\"vstState\":\"\",\"stateUpdateCount\":0,\"lv2State\":[false,{}],\"lilvPresetUri\":\"\",\"pathProperties\":{}},{\"instanceId\":48,\"title\":\"\",\"isEnabled\":true,\"uri\":\"uri://two-play/pipedal/pedalboard#Empty\",\"pluginName\":\"\",\"controlValues\":[],\"midiBindings\":[],\"midiChannelBinding\":null,\"vstState\":\"\",\"stateUpdateCount\":0,\"lv2State\":[false,{}],\"lilvPresetUri\":\"\",\"pathProperties\":{}},{\"instanceId\":47,\"title\":\"\",\"isEnabled\":true,\"uri\":\"uri://two-play/pipedal/pedalboard#Empty\",\"pluginName\":\"\",\"controlValues\":[],\"midiBindings\":[],\"midiChannelBinding\":null,\"vstState\":\"\",\"stateUpdateCount\":1,\"lv2State\":[false,{}],\"lilvPresetUri\":\"\",\"pathProperties\":{\"http://two-play.com/plugins/toob-ml#modelFile\":\"{\\\"otype_\\\": \\\"Path\\\",\\\"value\\\": \\\"/usr/lib/lv2/ToobAmp.lv2/models/tones/MesaBoogieMk2b_Crunch.json\\\"}\"}},{\"instanceId\":31,\"title\":\"\",\"isEnabled\":true,\"uri\":\"http://two-play.com/plugins/toob-freeverb\",\"pluginName\":\"TooB Freeverb\",\"controlValues\":[{\"key\":\"dryWet\",\"value\":0.653543293},{\"key\":\"roomSize\",\"value\":0.625},{\"key\":\"damping\",\"value\":0.574999988}],\"midiBindings\":[{\"symbol\":\"dryWet\",\"bindingType\":2,\"note\":72,\"control\":23,\"minControlValue\":0,\"maxControlValue\":127,\"minValue\":0,\"maxValue\":1,\"rotaryScale\":1,\"linearControlType\":0,\"switchControlType\":0}],\"midiChannelBinding\":null,\"vstState\":\"\",\"stateUpdateCount\":0,\"lv2State\":[false,{}],\"lilvPresetUri\":\"\",\"pathProperties\":{}}],\"nextInstanceId\":51,\"snapshots\":[],\"selectedSnapshot\":-1}}]
|
||||
@@ -24,6 +24,11 @@ export enum MidiDeviceSelection {
|
||||
DeviceList = 2
|
||||
}
|
||||
|
||||
// This feature is not yet completely implemented.
|
||||
export const midiChannelBindingControlFeatureEnabled: boolean = false; // set to true to enable the midi channel binding control in the plugin control view.
|
||||
|
||||
|
||||
|
||||
export default class MidiChannelBinding {
|
||||
deserialize(input: any) : MidiChannelBinding {
|
||||
this.deviceSelection = input.deviceSelection;
|
||||
|
||||
@@ -43,6 +43,7 @@ import {
|
||||
} from './Pedalboard';
|
||||
|
||||
import MidiIcon from './svg/ic_midi.svg?react';
|
||||
import { midiChannelBindingControlFeatureEnabled } from './MidiChannelBinding';
|
||||
|
||||
|
||||
const START_CONTROL = Pedalboard.START_CONTROL;
|
||||
@@ -995,7 +996,7 @@ withStyles(
|
||||
const classes = withStyles.getClasses(this.props);
|
||||
return (
|
||||
<div className={hasBorder ? classes.iconFrame : classes.borderlessIconFrame} onContextMenu={(e) => { e.preventDefault(); }}>
|
||||
{hasMidiConnector && (
|
||||
{hasMidiConnector && midiChannelBindingControlFeatureEnabled && (
|
||||
<div className={classes.midiConnectorDecoration} >
|
||||
<MidiIcon style={{ width: 16, height: 16, fill: this.props.theme.palette.text.secondary }} />
|
||||
</div>
|
||||
|
||||
@@ -27,6 +27,8 @@ import AutoZoom from './AutoZoom';
|
||||
|
||||
import ModGuiHost from './ModGuiHost';
|
||||
|
||||
import {midiChannelBindingControlFeatureEnabled} from './MidiChannelBinding';
|
||||
|
||||
import { withStyles } from "tss-react/mui";
|
||||
import { PiPedalModel, PiPedalModelFactory } from './PiPedalModel';
|
||||
import { UiPlugin, UiControl, UiFileProperty, UiFrequencyPlot, ScalePoint } from './Lv2Plugin';
|
||||
@@ -762,7 +764,7 @@ const PluginControlView =
|
||||
makeIoPluginInfo("Output", Pedalboard.END_PEDALBOARD_ITEM_URI);
|
||||
|
||||
midiBindingControl(pedalboardItem: PedalboardItem): ReactNode {
|
||||
if (!pedalboardItem.midiChannelBinding) {
|
||||
if ((!pedalboardItem.midiChannelBinding) || (midiChannelBindingControlFeatureEnabled === false)) {
|
||||
return false;
|
||||
}
|
||||
return (
|
||||
@@ -890,7 +892,7 @@ const PluginControlView =
|
||||
pedalboardItem.midiChannelBinding = MidiChannelBinding.CreateMissingValue();
|
||||
|
||||
}
|
||||
if (pedalboardItem.midiChannelBinding) {
|
||||
if (pedalboardItem.midiChannelBinding && midiChannelBindingControlFeatureEnabled) {
|
||||
nodes.push(this.midiBindingControl(pedalboardItem));
|
||||
}
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user