Merge pull request #239 from rerdavies/dev

v1.3.62 Merge
rerdavies · Oct 28, 2024 · c6b31f9 · c6b31f9
2 parents 4045447 + 805dd57
commit c6b31f9
Show file tree

Hide file tree

Showing 54 changed files with 1,825 additions and 1,057 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.16.0)
 project(pipedal 
-    VERSION 1.3.61
+    VERSION 1.3.62
     DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi"
     HOMEPAGE_URL "https://rerdavies.github.io/pipedal"
 )
-set (DISPLAY_VERSION "PiPedal v1.3.61-Release")
+set (DISPLAY_VERSION "PiPedal v1.3.62-Beta")
 set (PACKAGE_ARCHITECTURE "arm64")
 set (CMAKE_INSTALL_PREFIX "/usr/")
 

diff --git a/PiPedalCommon/src/include/util.hpp b/PiPedalCommon/src/include/util.hpp
@@ -51,6 +51,22 @@ namespace pipedal {
 
     }
 
+    template <typename T>
+    inline bool contains(const std::vector<T>&vector,const T&value)
+    {
+        for (auto i = vector.begin(); i != vector.end(); ++i)
+        {
+            if ((*i) == value) {
+                return true;
+            }
+        }
+        return false;
+    }
+    inline bool contains(const std::vector<std::string>&vector,const char*value)
+    {
+        return contains(vector,std::string(value));
+    }
+
     class NoCopy {
     public:
         NoCopy() { }

diff --git a/README.md b/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.3.61</a> 
+Download:&nbsp;<a href='https://rerdavies.github.io/pipedal/download.html'>v1.3.62</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.3.61 Release, providing [snapshots](https://rerdavies.github.io/pipedal/Snaphots.html), and a new Performance View. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+#### NEW version 1.3.62 Release, providing [snapshots](https://rerdavies.github.io/pipedal/Snaphots.html), and a new Performance View. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
 
 &nbsp;
 

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.3.61](https://github.com/rerdavies/pipedal/releases/download/)
+- [Raspberry Pi OS bookworm (64-bit) v1.3.62](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.3.61 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.3.62 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.3.61_arm64.deb 
+  sudo apt-get install pipedal_1.3.62_arm64.deb 
 ```
 Adjust accordingly if you have downloaded v1.1.31.
 

diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
@@ -1,5 +1,31 @@
 # Release Notes
 
+## PiPedal 1.3.62 Beta
+
+Features:
+- Plugins can now share uploaded model and IR files by type. For plugins with appropriate mod:fileTypes attributes, uploaded
+  files will be shared by category (Nam model, IR Files, Audio Tracks, Midi Songs, etc). Sharing of ML models are also supported, although 
+  that requires use of an extended mod:fileType (mlmodel) that MOD does not support. 
+- TooB Tuner stability issues fixed. The pitch detection algorithm has been improved, and the tuner now does filtering to avoid 
+  displaying a value when the current input isn't a steady note.
+- LV2 trigger controls are now displayed as buttons instead of toggle controls (maybe useful for 3rd-party looper plugins).
+
+Known issues:
+
+- There are a number of outstanding minor compatibility issues with Ratatouille. I intend to work with the author to address them.
+
+### Backwards Compatibility With the Previous Upload Directory Scheme
+
+Sharing file types poses a problem with previous versions of PiPedal which did not share uploads by file type, but instead placed uploads in a private directory for each plugin.
+In order to accomodate this, Pipedal provides legacy support for this situation. If a private upload directory for a plugin exists, the file property selection dialog will show
+both the new shared directories, and the old private directory. The private directory has a name that reflects the name of the plugin (e.g. "Ratatoille.lv2"). This directory only
+shows up if you have used the plugin on previous versiouns of Pipedal. If you have nothing of particular value in the old private upload directory, you can delete the plugin's private directory (which can be found in `/var/pipedal/audio_uploads`), and the private directory will no longer be displayed in the PiPedal UI.
+
+I anticipate providing a migration utility in the near future which will clean up and migrate legacy upload directories to the new directory structure (automatically uploading
+presets which reference uploaded files that have moved). In the meantime, I think you will find the current occomodation for legacy upload directories perfectly functional. 
+
+
+
 ## PiPedal 1.3.61 Release
 
 Bug fixes:

diff --git a/docs/download.md b/docs/download.md
@@ -4,15 +4,15 @@
 
 Download the most recent Debian (.deb) package for your platform:
 
-- <a href="https://github.com/rerdavies/pipedal/releases/download/v1.3.61/pipedal_1.3.61_arm64.deb">Raspberry Pi OS Bookworm (64-bit) v1.3.61</a>
+- <a href="https://github.com/rerdavies/pipedal/releases/download/v1.3.62/pipedal_1.3.62_arm64.deb">Raspberry Pi OS Bookworm (64-bit) v1.3.62</a>
 
 
 Install the package by running 
 
 ```
   sudo apt update
   cd ~/Downloads  
-  sudo apt-get install ./pipedal_1.3.61_arm64.deb
+  sudo apt-get install ./pipedal_1.3.62_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,15 +1,15 @@
 
 
 <img src="GithubBanner.png" width="100%"/>
-<a href="Installing.html"><i>v1.3.61</i></a>
+<a href="Installing.html"><i>v1.3.62</i></a>
 
 &nbsp;
 
 To download PiPedal, click [here](download.md). 
 To view PiPedal documentation, click [here](Documentation.md).
 
 
-#### NEW version 1.3.61 Release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+#### NEW version 1.3.62 Release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
 
 &nbsp;
 

diff --git a/lv2/aarch64/ToobAmp.lv2/CabIR.ttl b/lv2/aarch64/ToobAmp.lv2/CabIR.ttl
@@ -55,22 +55,22 @@ cabir:impulseFile
         a lv2:Parameter;
         rdfs:label "IR";
         pg:group cabir:impulseFile1Group ;
-        mod:fileTypes "wav,flac";
+        mod:fileTypes "ir,wav,flac";
 
         rdfs:range atom:Path.
 
 cabir:impulseFile2
         a lv2:Parameter;
         rdfs:label "IR";
         pg:group cabir:impulseFile2Group ;
-        mod:fileTypes "wav,flac";
+        mod:fileTypes "ir,wav,flac";
         rdfs:range atom:Path.
 
 cabir:impulseFile3
         a lv2:Parameter;
         rdfs:label "IR";
         pg:group cabir:impulseFile3Group ;
-        mod:fileTypes "wav,flac";
+        mod:fileTypes "ir,wav,flac";
         rdfs:range atom:Path.
 
 
@@ -93,7 +93,7 @@ cabir:impulseFile3
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 51 ;
+        lv2:microVersion 52 ;
         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 51 ;
+    lv2:microVersion 52 ;
 
     mod:brand "TooB";
     mod:label "TooB CabSim";

diff --git a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl b/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl
@@ -32,7 +32,7 @@
 toobimpulse:impulseFile
         a lv2:Parameter;
         rdfs:label "Reverb Impulse File";
-        mod:fileTypes "wav,flac";
+        mod:fileTypes "ir,wav,flac";
         rdfs:range atom:Path.
 
 
@@ -53,7 +53,7 @@ toobimpulse:impulseFile
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 51 ;
+        lv2:microVersion 52 ;
         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
@@ -31,7 +31,7 @@
 toobimpulse:impulseFile
         a lv2:Parameter;
         rdfs:label "File";
-        mod:fileTypes "wav,flac";
+        mod:fileTypes "ir,wav,flac";
         rdfs:range atom:Path.
 
 
@@ -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 51 ;
+        lv2:microVersion 52 ;
         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 51 ;
+        lv2:microVersion 52 ;
 
         mod:brand "TooB";
         mod:label "TooB Input";

diff --git a/lv2/aarch64/ToobAmp.lv2/PowerStage2l.ttl b/lv2/aarch64/ToobAmp.lv2/PowerStage2l.ttl
@@ -67,7 +67,7 @@ pstage:stage3
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
          lv2:minorVersion 0 ;
-        lv2:microVersion 51 ;
+        lv2:microVersion 52 ;
 
         mod:brand "TooB";
         mod:label "Power Stage";

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 51 ;
+        lv2:microVersion 52 ;
         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 51 ;
+        lv2:microVersion 52 ;
 
         uiext:ui <http://two-play.com/plugins/toob-tone-stack-ui>;                
 

diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so b/lv2/aarch64/ToobAmp.lv2/ToobAmp.so
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 51 ;
+        lv2:microVersion 52 ;
         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 51 ;
+        lv2:microVersion 52 ;
         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 51 ;
+        lv2:microVersion 52 ;
         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 51 ;
+        lv2:microVersion 52 ;
         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 51 ;
+        lv2:microVersion 52 ;
         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
@@ -31,7 +31,7 @@
 toobml:modelFile
         a lv2:Parameter;
         rdfs:label "Model";
-	mod:fileTypes "nam,nammodel";
+	mod:fileTypes "json,mlmodels";
         rdfs:range atom:Path.
 
 toobml:filterGroup
@@ -65,7 +65,7 @@ toobml:sagGroup
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 51 ;
+        lv2:microVersion 52 ;
         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.

diff --git a/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl b/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl
@@ -61,7 +61,7 @@ toobNam:eqGroup
         doap:license <https://rerdavies.github.io/pipedal/LicenseToobAmp> ;
         doap:maintainer <http://two-play.com/rerdavies#me> ;
         lv2:minorVersion 0 ;
-        lv2:microVersion 51 ;
+        lv2:microVersion 52 ;
         rdfs:comment """
 A port of Steven Atkinson's Neural Amp Modeler to LV2. 
 

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 51 ;
+        lv2:microVersion 52 ;
         rdfs:comment """
 TooB Tuner is a chromatic guitar tuner.
 """ ;

diff --git a/react/src/DialogEx.tsx b/react/src/DialogEx.tsx
@@ -198,6 +198,7 @@ class DialogEx extends React.Component<DialogExProps,DialogExState> implements I
         {
             this.onEnterKey();
         }
+        evt.stopPropagation();
     }
     render() {
         let { tag,onClose,...extra} = this.props;