Merge pull request #187 from rerdavies/dev

Release 1.2.45

CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.16.0)
 project(pipedal 
-    VERSION 1.2.44
+    VERSION 1.2.45
     DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi"
     HOMEPAGE_URL "https://rerdavies.github.io/pipedal"
 )
-set (DISPLAY_VERSION "PiPedal v1.2.42-Experimental")
+set (DISPLAY_VERSION "PiPedal v1.2.45-Release")
 set (PACKAGE_ARCHITECTURE "arm64")
 set (CMAKE_INSTALL_PREFIX "/usr/")
 

README.md

@@ -6,13 +6,13 @@
 <a href="https://rerdavies.github.io/pipedal/LicensePiPedal.html"><img src="https://img.shields.io/badge/MIT-MIT?label=license&color=%23808080"/></a>
 <a href="https://github.com/rerdavies/pipedal/actions"><img src="https://img.shields.io/github/actions/workflow/status/rerdavies/pipedal/cmake.yml?branch=main"/></a>
 
-Download:&nbsp;<a href='https://rerdavies.github.io/pipedal/download.html'>v1.2.42</a> 
+Download:&nbsp;<a href='https://rerdavies.github.io/pipedal/download.html'>v1.2.45</a> 
 Website:&nbsp;[https://rerdavies.github.io/pipedal](https://rerdavies.github.io/pipedal).
 Documentation:&nbsp;[https://rerdavies.github.io/pipedal/Documentation.html](https://rerdavies.github.io/pipedal/Documentation.html).
 
 &nbsp;
 
-#### NEW version 1.2.44 Release, providing support for Raspberry Pi OS Bookworm. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+#### NEW version 1.2.45 Release, providing support for Raspberry Pi OS Bookworm. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
 
 &nbsp;
 

docs/Installing.md

@@ -13,17 +13,17 @@ page_icon: img/Install4.jpg
 
 Download the most recent Debian (.deb) package for your platform:
 
-- [Raspberry Pi OS bookworm (64-bit) v1.2.42](https://github.com/rerdavies/pipedal/releases/download/)
+- [Raspberry Pi OS bookworm (64-bit) v1.2.45](https://github.com/rerdavies/pipedal/releases/download/)
 - [Ubuntu/Raspberry Pi OS bullseyeye (64-bit) v1.2.31](https://github.com/rerdavies/pipedal/releases/download/v1.1.31/pipedal_1.1.31_arm64.deb)
 
-Version 1.2.44 has not yet been tested on Ubuntu or Raspberry Pi OS bullseye. On these platforms, we recommend that you use version 1.1.31.
+Version 1.2.45 has not yet been tested on Ubuntu or Raspberry Pi OS bullseye. On these platforms, we recommend that you use version 1.1.31.
 
 Install the package by running 
 
 ```
   sudo apt update
   cd ~/Downloads  
-  sudo apt-get install pipedal_1.2.42_arm64.deb 
+  sudo apt-get install pipedal_1.2.45_arm64.deb 
 ```
 Adjust accordingly if you have downloaded v1.1.31.
 

docs/ReleaseNotes.md

@@ -1,5 +1,23 @@
 # Release Notes
 
+## PiPedal 1.2.45 Release
+
+This version focuses on fixes and improvements to TooB Neural Amp Modeler.
+TooB NAM now uses about 20% less CPU, which can help enormously on Raspberry Pi 4. 
+
+You may need to change your audio buffers to prevent dropouts when using TooB Neural Amp Modeler. Setting your audio buffers to 32x4 seems to produce good results. You may also want experiment with 16x4 audio buffers. This seems to work, but it has had limited testing so far, so I can't say with any certainty whether it is stable for long-term use. 2-buffer audio settings should be avoided. As always, using your Pi for anything else at the same time you are using PiPedal will cause XRuns.
+
+I would once again like to extend special thanks and acknowledgements to Steven Atkins for his outstanding work on the NeuralAmpModelerCore project on which TooB Neural Amp Modeler depends (as do almost all other Neural Amp Modeler plugins).
+
+Bug fixes:
+
+- The About page now displays the correct version.
+- TooB NAM frequency response now displays correctly.
+- TooB NAM no longer displays error messages when loading.
+- Update Dialog has better layout on portrait phone displays.
+- Prevent brief flashing of the Reload... button during the last phase of an update.
+
+
 ## PiPedal 1.2.44 Release 
 
 This version includes the following new features:

docs/download.md

@@ -4,17 +4,17 @@
 
 Download the most recent Debian (.deb) package for your platform:
 
-- <a href="https://github.com/rerdavies/pipedal/releases/download/v1.2.42/pipedal_1.2.42_arm64.deb">Raspberry Pi OS Bookworm (64-bit) v1.2.42</a>
+- <a href="https://github.com/rerdavies/pipedal/releases/download/v1.2.45/pipedal_1.2.45_arm64.deb">Raspberry Pi OS Bookworm (64-bit) v1.2.45</a>
 - <a href="https://github.com/rerdavies/pipedal/releases/download/v1.1.31/pipedal_1.1.31_arm64.deb">Ubuntu 21.04 or Raspberry Pi OS bullseyeyeye (64-bit) v1.1.31</a>
 
-v1.2.42 is does not currently support Ubuntu 21.04, or older versions of Raspberry Pi OS. 
+v1.2.45 is does not currently support Ubuntu 21.04, or older versions of Raspberry Pi OS. 
 
 Install the package by running 
 
 ```
   sudo apt update
   cd ~/Downloads  
-  sudo apt-get install ./pipedal_1.2.42_arm64.deb
+  sudo apt-get install ./pipedal_1.2.45_arm64.deb
 ```
 
 Follow the instructions in [_Configuring PiPedal After Installation_](https://rerdavies.github.io/pipedal/Configuring.html) to complete the installation.

docs/index.md

@@ -1,15 +1,15 @@
 
 
 <img src="GithubBanner.png" width="100%"/>
-<a href="Installing.html"><i>v1.2.42</i></a>
+<a href="Installing.html"><i>v1.2.45</i></a>
 
 &nbsp;
 
 To download PiPedal, click [here](download.md). 
 To view PiPedal documentation, click [here](Documentation.md).
 
 
-#### NEW version 1.2.44 Release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+#### NEW version 1.2.45 Release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
 
 &nbsp;
 

lv2/aarch64/ToobAmp.lv2/CabIR.ttl

@@ -88,7 +88,7 @@ cabir:impulseFile3
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 
 TooB Cab IR is a convolution-based guitar cabinet impulse response simulator.

lv2/aarch64/ToobAmp.lv2/CabSim.ttl

@@ -49,7 +49,7 @@ toob:frequencyResponseVector
     doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
     doap:maintainer <http://two-play.com/rerdavies#me> ;
     lv2:minorVersion 0 ;
-    lv2:microVersion 43 ;
+    lv2:microVersion 45 ;
 
     mod:brand "TooB";
     mod:label "TooB CabSim";

lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl

@@ -51,7 +51,7 @@ toobimpulse:impulseFile
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 
 Convolution reverb is a notoriously compute-intensive effect. If you are having performance issues,  use the Max T control to constrain the length of the impulse file to

lv2/aarch64/ToobAmp.lv2/ConvolutionReverbStereo.ttl

@@ -49,7 +49,7 @@ toobimpulse:impulseFile
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
          lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 
 

lv2/aarch64/ToobAmp.lv2/InputStage.ttl

@@ -65,7 +65,7 @@ inputStage:filterGroup
         doap:license <https://two-play.com/TooB/licenses/isc> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
 
         mod:brand "TooB";
         mod:label "TooB Input";

lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl

@@ -58,7 +58,7 @@
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment "TooB spectrum analyzer" ;
 
         mod:brand "TooB";

lv2/aarch64/ToobAmp.lv2/ToneStack.ttl

@@ -55,7 +55,7 @@ tonestack:eqGroup
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
          lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
 
         uiext:ui <http://two-play.com/plugins/toob-tone-stack-ui>;                
 

lv2/aarch64/ToobAmp.lv2/ToobAmp.so.0

@@ -1 +1 @@
-ToobAmp.so.1.1.43
+ToobAmp.so.1.1.45

lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl

@@ -40,7 +40,7 @@
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 Emulation of a Boss CE-2 Chorus.
 

lv2/aarch64/ToobAmp.lv2/ToobDelay.ttl

@@ -41,7 +41,7 @@
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 A straightforward no-frills digital delay.
 

lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl

@@ -41,7 +41,7 @@
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 Emulation of a Boss BF-2 Flanger, based on circuit analysis and simulation of the original.
 

lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl

@@ -41,7 +41,7 @@
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
          lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 Digital emulation of a Boss BF-2 Flanger.
 

lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl

@@ -41,7 +41,7 @@
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
          lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 Toob Freeverb is an Lv2 implementation of the famous Freeverb reverb effect. FreeVerb delivers a well-balanced reverb with very little tonal coloration.
 

lv2/aarch64/ToobAmp.lv2/ToobML.ttl

@@ -63,7 +63,7 @@ toobml:sagGroup
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 The TooB ML Amplifier plugin provides emulation of a variety of amplifiers and overdrive pedals that are implemented 
 using neural-network-based machine learning models of real amplifiers.

lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl

@@ -58,7 +58,7 @@ toobNam:eqGroup
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 A port of Steven Atkinson's Neural Amp Modeler to LV2. 
 

lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl

@@ -40,7 +40,7 @@
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 43 ;
+        lv2:microVersion 45 ;
         rdfs:comment """
 TooB Tuner is a chromatic guitar tuner.
 """ ;

react/src/AboutDialog.tsx

@@ -218,7 +218,7 @@ const AboutDialog = withStyles(styles, { withTheme: true })(
                                     </span>
                                 </Typography>
                                 <Typography noWrap display="block" variant="body2" style={{ marginBottom: 12 }}  >
-                                    Copyright &#169; 2022 Robin Davies.
+                                    Copyright &#169; 2022-2024 Robin Davies.
                                 </Typography>
                                 {this.model.isAndroidHosted() && (
                                     <Typography noWrap display="block" variant="body2" style={{ marginBottom: 0 }}  >

react/src/PiPedalModel.tsx

@@ -54,6 +54,8 @@ export enum State {
     InstallingUpdate,
 };
 
+class UpdatedError extends Error {
+};
 export function wantsLoadingScreen(state: State) {
     return state >= State.Reconnecting;
 }
@@ -728,10 +730,7 @@ export class PiPedalModel //implements PiPedalModel
             if (current.currentVersion.length !== 0 && current.currentVersion !== updateStatus.currentVersion) {
                 // !! Server has been updated!!!
                 this.reloadPage();
-                throw new Error("Reloading...");
-            }
-            if (updateStatus.getActiveRelease().updateAvailable) {
-                this.promptForUpdate.set(true);
+                throw new UpdatedError("Server has been updated");
             }
             this.updatePromptForUpdate()
         }
@@ -879,7 +878,12 @@ export class PiPedalModel //implements PiPedalModel
                 this.setState(State.Ready);
             })
             .catch((what) => {
-                this.onError(what.toString());
+                if (what instanceof UpdatedError)
+                {
+                    // do nothing. a page reload is imminent and unavoidable as soon as we return to the dispatcher.
+                } else {
+                    this.onError(what.toString());
+                }
             })
     }
     makeSocketServerUrl(hostName: string, port: number): string {
@@ -1070,8 +1074,20 @@ export class PiPedalModel //implements PiPedalModel
     }
 
 
-    onError(msg: string): void {
-        this.errorMessage.set(msg);
+    onError(message: string| Error): void {
+        let m = message;
+        if (message instanceof Error)
+        {
+            let e = message as Error;
+            if (e.message) {
+                m = e.message as string;
+            } else {
+                m = e.toString();
+            }
+        } else{
+            m = message.toString();
+        }
+        this.errorMessage.set(m);
         this.state.set(State.Error);
 
     }
@@ -1382,10 +1398,10 @@ export class PiPedalModel //implements PiPedalModel
         let changed = item.setControlValue(key, value);
 
         if (changed) {
-            this.pedalboard.set(newPedalboard);
             if (notifyServer) {
                 this._setServerControl("setControl", instanceId, key, value);
             }
+            this.pedalboard.set(newPedalboard);
             for (let i = 0; i < this._controlValueChangeItems.length; ++i) {
                 let item = this._controlValueChangeItems[i];
                 if (instanceId === item.instanceId) {
@@ -1895,7 +1911,18 @@ export class PiPedalModel //implements PiPedalModel
     }
 
     showAlert(message: string| Error): void {
-        let m = message.toString();
+        let m = message;
+        if (message instanceof Error)
+        {
+            let e = message as Error;
+            if (e.message) {
+                m = e.message as string;
+            } else {
+                m = e.toString();
+            }
+        } else{
+            m = message.toString();
+        }
         this.alertMessage.set(m);
     }