Merge pull request #166 from rerdavies/1.2.35

1.2.36
rerdavies · Aug 12, 2024 · 084e86f · 084e86f
2 parents f824086 + 0baebea
commit 084e86f
Show file tree

Hide file tree

Showing 36 changed files with 107 additions and 56 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.16.0)
 project(pipedal 
-    VERSION 1.2.34
+    VERSION 1.2.36
     DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi"
     HOMEPAGE_URL "https://rerdavies.github.io/pipedal"
 )
-set (DISPLAY_VERSION "v1.2.34beta2")
+set (DISPLAY_VERSION "v1.2.36beta2")
 
 set (CMAKE_INSTALL_PREFIX "/usr/")
 

diff --git a/PiPedalCommon/src/RegDb.cpp b/PiPedalCommon/src/RegDb.cpp
@@ -177,7 +177,7 @@ struct PowerRule
 
 const char *filePaths[] =
     {
-        "/lib/firmware/regulatory.db", // bookworm, buster.
+        "/lib/firmware/regulatory.db", // bookworm, bullseye.
         "/usr/lib/crda/regulatory.bin" // previous versions?.
 };
 

diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 
 <img src='docs/GithubBanner.png' width="100%" /><br/>
 
-Download: <a href='https://rerdavies.github.io/pipedal/download.html'>v1.2.34 Beta2</a> 
+Download: <a href='https://rerdavies.github.io/pipedal/download.html'>v1.2.36 Beta3</a> 
 
 Website: [https://rerdavies.github.io/pipedal](https://rerdavies.github.io/pipedal).
 
 
-> NEW version 1.2.34 Beta2 release, providing support for Raspberry Pi OS Bookworm. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+> NEW version 1.2.36 Beta3 release, providing support for Raspberry Pi OS Bookworm. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
 
 Use your Raspberry Pi as a guitar effects pedal. Configure and control PiPedal with your phone or tablet.
 PiPedal running on a Raspberry Pi 4 provides stable super-low-latency audio via external USB audio devices, or internal Raspberry Pi audio hats.

diff --git a/debian/control b/debian/control
@@ -1,5 +1,5 @@
 Architecture: arm64
-Depends: libstdc++6 (>= 9), libasound2 (>= 1.0.17), libc6 (>= 2.34), libgcc-s1 (>= 4.0), libjack-jackd2-0 (>= 1.9.10+20150825) | libjack-0.125, liblilv-0-0 (>= 0.22.0~dfsg0), libnl-3-200 (>= 3.2.7), libnl-genl-3-200 (>= 3.2.7), libstdc++6 (>= 11), libsystemd0, dnsmasq(>= 2.85)
+Depends: libstdc++6 (>= 9), libasound2 (>= 1.0.17), libc6 (>= 2.34), libgcc-s1 (>= 4.0), libjack-jackd2-0 (>= 1.9.10+20150825) | libjack-0.125, liblilv-0-0 (>= 0.22.0~dfsg0), libnl-3-200 (>= 3.2.7), libnl-genl-3-200 (>= 3.2.7), libstdc++6 (>= 11), libsystemd0, dnsmasq(>= 2.85),lv2-dev(>=1.14)
 Description: IoT guitar effect for Raspberry Pi
  IoT guitar effect pedal for Raspberry Pi, with phone-friendly web interface.
 Homepage: https://github.com/rerdavies/pipedal

diff --git a/docs/Installing.md b/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.34 Beta2](https://github.com/rerdavies/pipedal/releases/download/)
-- [Ubuntu/Raspberry Pi OS buster (64-bit) v1.2.31](https://github.com/rerdavies/pipedal/releases/download/v1.1.31/pipedal_1.1.31_arm64.deb)
+- [Raspberry Pi OS bookworm (64-bit) v1.2.36 Beta3](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.34 has not yet been tested Ubuntu and Raspberry Pi OS buster. On these platforms, we recommend that you use version 1.1.31.
+Version 1.2.36 has not yet been tested Ubuntu and 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 dpkg -i pipedal_1.2.34_arm64.deb 
+  sudo dpkg -i pipedal_1.2.36_arm64.deb 
 ```
 Adjust accordingly if you have downloaded v1.1.31.
 

diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
@@ -1,4 +1,13 @@
 # Release Notes
+## Pipedal 1.2.36 Beta3
+
+Fixes for the following issues: 
+
+- Failure to open audio devices on reboot for devices that initialize slowly.
+- TooB ML and Toob Neural Amp Modeller UI issues.
+- Misbehavior with preset names after renaming a preset.
+- Change default audio buffers to 64x3.
+- Filtering not working in plugin selection dialog.
 
 ## PiPedal 1.2.34 Beta2
 
@@ -13,7 +22,7 @@ Fixes the following issues:
 
 ## PiPedal 1.2.33 Beta1
 
-This release provides compatibility with Raspberry Pi OS bookworm. If you are using Raspberry Pi OS buster, or Ubuntu 21.04, please use PiPedal v1.1.31 instead.
+This release provides compatibility with Raspberry Pi OS bookworm. If you are using Raspberry Pi OS bullseye, or Ubuntu 21.04, please use PiPedal v1.1.31 instead.
 
 If you are using the Android client, you should make sure you are using the most recent version, which includes significant improvements to Wi-Fi Direct pairing.
 

diff --git a/docs/SystemRequirements.md b/docs/SystemRequirements.md
@@ -16,7 +16,7 @@ PiPedal has been tested on the following Operating Systems:
 Older versions of PiPedal (v1.1.31) have been tested on the following operating systems:
 
 * Ubuntu 21.04 or later, 64-bit
-* Raspberry PI OS 64-bit Buster
+* Raspberry PI OS 64-bit bullseye
 
 Compatibility testing on these OS's for current versions of PiPedal is ongoing.
 

diff --git a/docs/download.md b/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.34/pipedal_1.2.34_arm64.deb">Raspberry Pi OS Bookworm (64-bit) v1.2.34 Beta2</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 Buster (64-bit) v1.1.31</a>
+- <a href="https://github.com/rerdavies/pipedal/releases/download/v1.2.36/pipedal_1.2.36_arm64.deb">Raspberry Pi OS Bookworm (64-bit) v1.2.36 Beta3</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.34 Beta1 is does not currently support Ubuntu 21.04, or older versions of Raspberry Pi OS. 
+v1.2.36 Beta3 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.34_arm64.deb
+  sudo apt-get install ./pipedal_1.2.36_arm64.deb
 ```
 
 Follow the instructions in [_Configuring PiPedal After Installation_](https://rerdavies.github.io/pipedal/Configuring.html) to complete the installation.
diff --git a/docs/index.md b/docs/index.md
@@ -1,13 +1,13 @@
 
 
 <img src="GithubBanner.png" width="100%"/>
-<a href="Installing.html"><i>v1.2.34</i></a>
+<a href="Installing.html"><i>v1.2.36</i></a>
 
 &nbsp;
 
 To download PiPedal, click [here](download.md).
 
-> NEW version 1.2.34 Beta2 release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+> NEW version 1.2.36 Beta3 release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
 
 
 Use your Raspberry Pi as a guitar effects pedal. Configure and control PiPedal with your phone or tablet.

diff --git a/lv2/aarch64/ToobAmp.lv2/CabIR.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         rdfs:comment """
 
 TooB Cab IR is a convolution-based guitar cabinet impulse response simulator.

diff --git a/lv2/aarch64/ToobAmp.lv2/CabSim.ttl b/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 31 ;
+    lv2:microVersion 36 ;
 
     mod:brand "TooB";
     mod:label "TooB CabSim";

diff --git a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         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

diff --git a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverbStereo.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         rdfs:comment """
 
 

diff --git a/lv2/aarch64/ToobAmp.lv2/InputStage.ttl b/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 31 ;
+        lv2:microVersion 36 ;
 
         mod:brand "TooB";
         mod:label "TooB Input";

diff --git a/lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         rdfs:comment "TooB spectrum analyzer" ;
 
         mod:brand "TooB";

diff --git a/lv2/aarch64/ToobAmp.lv2/ToneStack.ttl b/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 31 ;
+        lv2:microVersion 36 ;
 
         uiext:ui <http://two-play.com/plugins/toob-tone-stack-ui>;                
 

diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so.0 b/lv2/aarch64/ToobAmp.lv2/ToobAmp.so.0
@@ -1 +1 @@
-ToobAmp.so.1.1.31
+ToobAmp.so.1.1.36
diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so.1.1.31 b/lv2/aarch64/ToobAmp.lv2/ToobAmp.so.1.1.31
diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so.1.1.36 b/lv2/aarch64/ToobAmp.lv2/ToobAmp.so.1.1.36
diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so b/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so
diff --git a/lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         rdfs:comment """
 Emulation of a Boss CE-2 Chorus.
 

diff --git a/lv2/aarch64/ToobAmp.lv2/ToobDelay.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         rdfs:comment """
 A straightforward no-frills digital delay.
 

diff --git a/lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         rdfs:comment """
 Emulation of a Boss BF-2 Flanger, based on circuit analysis and simulation of the original.
 

diff --git a/lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         rdfs:comment """
 Digital emulation of a Boss BF-2 Flanger.
 

diff --git a/lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         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.
 

diff --git a/lv2/aarch64/ToobAmp.lv2/ToobML.ttl b/lv2/aarch64/ToobAmp.lv2/ToobML.ttl
@@ -14,6 +14,8 @@
 @prefix param:   <http://lv2plug.in/ns/ext/parameters#> .
 @prefix work:  <http://lv2plug.in/ns/ext/worker#> .
 @prefix pg:      <http://lv2plug.in/ns/ext/port-groups#> .
+@prefix pipedal_ui: <http://github.com/rerdavies/pipedal/ui#> .
+@prefix toob: <http://two-play.com/plugins/toob#> .
 
 @prefix atom: <http://lv2plug.in/ns/ext/atom#> .
 @prefix patch: <http://lv2plug.in/ns/ext/patch#> .
@@ -55,7 +57,7 @@ toobml:sagGroup
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 31 ;
+        lv2:microVersion 36 ;
         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.
@@ -450,4 +452,29 @@ and uses model files from the GuitarML Neural Pi project (https://github.com/Gui
     lv2:extensionData uiext:resize ;
     lv2:extensionData uiext:idleInterface;
     lv2:requiredFeature uiext:idleInterface ;
+    patch:writable 
+        <http://two-play.com/plugins/toob#frequencyResponseVector>;
     .
+
+<http://two-play.com/plugins/toob-ml> 
+     pipedal_ui:ui <http://two-play.com/plugins/toob-ml#piPedalUI>.
+
+
+<http://two-play.com/plugins/toob-ml#piPedalUI> 
+    a pipedal_ui:ui ;
+    pipedal_ui:frequencyPlot
+    [
+        lv2:index 8 ; 
+        pg:group toobml:filterGroup ;
+
+        pipedal_ui:patchProperty toob:frequencyResponseVector;
+        pipedal_ui:xLeft 30 ;
+        pipedal_ui:xRight 22050 ;
+        pipedal_ui:yTop 10 ;
+        pipedal_ui:yBottom -35 ;
+        pipedal_ui:xLog 1 ;
+        pipedal_ui:yDb 1 ;
+        pipedal_ui:width 160 ;
+    ]
+    .
+
diff --git a/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         rdfs:comment """
 A port of Steven Atkinson's Neural Amp Modeler to LV2. 
 
@@ -338,7 +338,7 @@ toobNam:ui
         pipedal_ui:frequencyPlot 
         [
                 pipedal_ui:patchProperty toobNam:FrequencyResponse;
-                lv2:index 7 ;
+                lv2:index 9 ;
                 pg:group toobNam:eqGroup ;
                 pipedal_ui:width: 200;
         ]

diff --git a/lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl b/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 31 ;
+        lv2:microVersion 36 ;
         rdfs:comment """
 TooB Tuner is a chromatic guitar tuner.
 """ ;

diff --git a/react/public/var/config.json b/react/public/var/config.json
@@ -1,5 +1,5 @@
 {
-    "socket_server_port": 8080,
+    "socket_server_port": 80,
     "socket_server_address": "*",
     "debug": true,
     "max_upload_size": 1048576,

diff --git a/react/src/PluginOutputControl.tsx b/react/src/PluginOutputControl.tsx
@@ -353,7 +353,7 @@ const PluginOutputControl =
                                         <div style={{width: 4, height: (this.DB_VU_HEIGHT-yellowLevel),position: "absolute", marginTop: yellowLevel, background: "#0A0"}} />
 
                                         <div ref={this.dbVuRef} style={{ width: 4,position: "absolute",  marginTop: 0,height: this.VU_HEIGHT, background: "#000" }} />
-                                        <div ref={this.dbVuTelltaleRef} style={{ width: 4,position: "absolute",  marginTop: 0,height: 3, background: "#C00" }} />
+                                        <div ref={this.dbVuTelltaleRef} style={{ width: 4,position: "absolute",  marginTop: 100,height: 3, background: "#C00" }} />
                                     </div>
                                 </div>
 

diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
@@ -1961,7 +1961,7 @@ namespace pipedal
             for (int retry = 0; retry < 15; ++retry)
             {
                 err = snd_pcm_open(&playbackHandle, alsaDeviceName.c_str(), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
-                if (err == -EBUSY)
+                if (err < 0) // field report of a device that is present, but won't immediately open.
                 {
                     sleep(1);
                     continue;

diff --git a/src/ConfigMain.cpp b/src/ConfigMain.cpp
@@ -603,12 +603,19 @@ void SetVarPermissions(
     using namespace std::filesystem;
     try {
         if (fs::exists(path)) {
-
+            chown(path.c_str(),uid,gid);
             if (fs::is_directory(path)) {
                 fs::permissions(path, directoryPermissions, fs::perm_options::replace);
                 for (const auto& entry : fs::recursive_directory_iterator(path)) {
+                    cout << "    " << entry.path() << endl;
+
+                    if (chown(entry.path().c_str(),uid,gid) != 0)
+                    {
+                        std::cout << "Error: failed to set ownership of file " << entry.path() << std::endl;
+                    }
+
                     try {
-                        if (fs::is_directory(entry))
+                        if (fs::is_directory(entry.path()))
                         {
                             fs::permissions(entry.path(), directoryPermissions, fs::perm_options::replace);
                         } else {
@@ -618,15 +625,11 @@ void SetVarPermissions(
                     {
                         std::cout << "Error: failed to set permissions on file " << entry.path() << std::endl;                        
                     }
-                    if (chown(path.c_str(),uid,gid) != 0)
-                    {
-                        std::cout << "Error: failed to set ownership of file " << entry.path() << std::endl;
-                    }
 
                 }
             } else {
                 fs::permissions(path,filePermissions, fs::perm_options::replace);
-                chown(path.c_str(),uid,gid);
+
             }
         } else {
             std::cout  << "Error: Path does not exist: " << path << std::endl;

diff --git a/src/JackServerSettings.hpp b/src/JackServerSettings.hpp
@@ -34,7 +34,7 @@ namespace pipedal
         std::string alsaDevice_;
         uint64_t sampleRate_ = 0;
         uint32_t bufferSize_ = 64;
-        uint32_t numberOfBuffers_ = 2;
+        uint32_t numberOfBuffers_ = 3;
 
     public:
         JackServerSettings();