From 33969077820a20aa3cfbff1bacf15582b30c4e36 Mon Sep 17 00:00:00 2001 From: Extremesecrecy <10959169+extremesecrecy@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:52:52 -0700 Subject: [PATCH] Revert to original Revert to original --- vite/src/pipedal/PiPedalModel.tsx | 37 +++++-------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) diff --git a/vite/src/pipedal/PiPedalModel.tsx b/vite/src/pipedal/PiPedalModel.tsx index 73c8e15..b1a0c11 100644 --- a/vite/src/pipedal/PiPedalModel.tsx +++ b/vite/src/pipedal/PiPedalModel.tsx @@ -1,3 +1,4 @@ +@@ -1,3543 +1,3543 @@ // Copyright (c) 2022 Robin Davies // // Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -2343,22 +2344,6 @@ export class PiPedalModel //implements PiPedalModel } } setPatchProperty(instanceId: number, uri: string, value: any): Promise { - // Audio related properties are written without waiting for a reply. - // These URIs correspond to Toob player audio state. The server - // broadcasts changes via on...changed messages, so we don't - // need to wait for the reply when updating them. - const audioProps = [ - "http://two-play.com/plugins/toob-player#audioFile", - "http://two-play.com/plugins/toob-player#loop", - "http://two-play.com/plugins/toob-player#seek", - ]; - if (audioProps.indexOf(uri) >= 0) { - if (this.webSocket) { - this.webSocket.send("setPatchProperty", { instanceId: instanceId, propertyUri: uri, value: value }); - } - return Promise.resolve(true); - } - let result = new Promise((resolve, reject) => { if (this.webSocket) { this.webSocket.request( @@ -2525,18 +2510,11 @@ export class PiPedalModel //implements PiPedalModel }); } setJackServerSettings(jackServerSettings: JackServerSettings): void { - this.webSocket?.request("setJackServerSettings", jackServerSettings) .catch((error) => { this.showAlert(error); }); } - applyJackServerSettings(jackServerSettings: JackServerSettings): void { - this.webSocket?.request("applyJackServerSettings", jackServerSettings) - .catch((error) => { - this.showAlert(error); - }); - } updateVst3State(pedalboard: Pedalboard) { // let it = pedalboard.itemsGenerator(); @@ -3006,7 +2984,7 @@ export class PiPedalModel //implements PiPedalModel // notify the server. let ws = this.webSocket; if (!ws) { - resolve(); + reject("Not connected."); return; } ws.request( @@ -3017,8 +2995,7 @@ export class PiPedalModel //implements PiPedalModel resolve(); }) .catch((err) => { - // ignore expected disconnects/errors - resolve(); + reject(err); }); }); @@ -3070,13 +3047,12 @@ export class PiPedalModel //implements PiPedalModel serverConfigSettings ) .then(() => { - resolve(); + //resolve(); }) .catch((err) => { - // ignore expected disconnects/errors - resolve(); + //resolve(); }); - //resolve(); + resolve(); }); this.expectDisconnect(ReconnectReason.LoadingSettings); @@ -3564,4 +3540,3 @@ export class PiPedalModelFactory { } }; -