v1.0.21 release

- Performance improvements, TooB Convolution Reverb, Cab IR.
- Bug fix:CabIR  Impulses #2 and #3 load wrong file.
- Bug fix: Android client upload file extensions

CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.16.0)
 project(pipedal 
-    VERSION 1.1.20
+    VERSION 1.1.21
     DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi"
     HOMEPAGE_URL "https://rerdavies.github.io/pipedal"
 )
-set (DISPLAY_VERSION "v1.1.20")
+set (DISPLAY_VERSION "v1.1.21")
 
 set (CMAKE_INSTALL_PREFIX "/usr/")
 

README.md

@@ -1,7 +1,7 @@
 
 <img src='docs/GithubBanner.png' width="100%" /><br/>
 
-Download: <a href='https://rerdavies.github.io/pipedal/download.html'>v1.1.20</a> 
+Download: <a href='https://rerdavies.github.io/pipedal/download.html'>v1.1.21</a> 
 
 Website: [https://rerdavies.github.io/pipedal](https://rerdavies.github.io/pipedal).
 

debian/control

@@ -9,6 +9,6 @@ Package: pipedal
 Pre-Depends: hostapd;authbind;dnsmasq
 Priority: optional
 Section: sound
-Version: 1.1.20
+Version: 1.1.21
 Installed-Size: 15147
 

docs/Installing.md

@@ -13,14 +13,14 @@ page_icon: img/Install4.jpg
 
 Download the most recent Debian (.deb) package for your platform:
 
-- [Ubuntu/Raspberry Pi OS (64-bit) v1.1.20](https://github.com/rerdavies/pipedal/releases/download/v1.1.20/pipedal_1.1.20_arm64.deb)
+- [Ubuntu/Raspberry Pi OS (64-bit) v1.1.21](https://github.com/rerdavies/pipedal/releases/download/v1.1.21/pipedal_1.1.21_arm64.deb)
 
 Install the package by running 
 
 ```
   sudo apt update
   cd ~/Downloads  
-  sudo apt-get install ./pipedal_1.1.20_arm64.deb
+  sudo apt-get install ./pipedal_1.1.21_arm64.deb
 ```
 On Raspberry Pi OS, if you have a graphical desktop installed, you can also install the package by double-clicking on the downloaded package in the File Manager.
 

docs/ReleaseNotes.md

@@ -1,6 +1,6 @@
 # Release Notes
 
-## PiPedal 1.1.20
+## PiPedal 1.1.21
 
 Features:
 

docs/download.md

@@ -4,14 +4,14 @@
 
 Download the most recent Debian (.deb) package for your platform:
 
-- [Ubuntu or Raspberry Pi OS (64-bit)](https://github.com/rerdavies/pipedal/releases/download/v1.1.20/pipedal_1.1.20_arm64.deb) v1.1.20
+- [Ubuntu or Raspberry Pi OS (64-bit)](https://github.com/rerdavies/pipedal/releases/download/v1.1.21/pipedal_1.1.21_arm64.deb) v1.1.21
 
 Install the package by running 
 
 ```
   sudo apt update
   cd ~/Downloads  
-  sudo apt-get install ./pipedal_1.1.20_arm64.deb
+  sudo apt-get install ./pipedal_1.1.21_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,7 +1,7 @@
 
 
 <img src="GithubBanner.png" width="100%"/>
-<a href="Installing.html"><i>v1.1.20</i></a>
+<a href="Installing.html"><i>v1.1.21</i></a>
 
 &nbsp;
 

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

@@ -1 +1 @@
-ToobAmp.so.1.0.8
+ToobAmp.so.1.0.9

react/src/AppThemed.tsx

@@ -318,6 +318,7 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
         };
 
         this.errorChangeHandler_ = this.setErrorMessage.bind(this);
+        this.unmountListener = this.unmountListener.bind(this);
         this.stateChangeHandler_ = this.setDisplayState.bind(this);
         this.presetChangedHandler = this.presetChangedHandler.bind(this);
         this.alertMessageChangedHandler = this.alertMessageChangedHandler.bind(this);
@@ -427,12 +428,10 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
         this.setState({
             isDrawerOpen: false,
         });
-        if (this.model_.isAndroidHosted())
+        if (this.model_.isAndroidHosted()) {
-        {
             this.model_.showAndroidDonationActivity();
         } else {
-            if (window)
+            if (window) {
-            {
                 window.open("https://github.com/sponsors/rerdavies", '_blank');
             }
         }
@@ -488,17 +487,18 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
         setFullScreen(this.state.isFullScreen);
         this.setState({ isFullScreen: !this.state.isFullScreen });
     }
+
+    private unmountListener(e: Event) {
+        e.preventDefault();
+        if (this.model_.state.get() === State.Ready && !this.model_.isAndroidHosted()) {
+            (e as any).returnValue = "Are you sure you want to leave this page?";
+            return "Are you sure you want to leave this page?";
+        }
+    }
     componentDidMount() {
 
         super.componentDidMount();
-
+        window.addEventListener("beforeunload",this.unmountListener);
-        window.addEventListener("beforeunload", (e) => {
-            e.preventDefault();
-            if (this.model_.state.get() === State.Ready) {
-                e.returnValue = "Are you sure you want to leave this page?";
-                return "Are you sure you want to leave this page?";
-            }
-        });
 
         this.model_.errorMessage.addOnChangedHandler(this.errorChangeHandler_);
         this.model_.state.addOnChangedHandler(this.stateChangeHandler_);
@@ -510,8 +510,8 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
     }
 
 
-    updateOverscroll(): void {
+updateOverscroll(): void {
-        if (this.model_.serverVersion) {
+    if(this.model_.serverVersion) {
     // no pull-down refresh on android devices once we're ready (unless we're debug)
     let preventOverscroll =
         this.model_.state.get() === State.Ready
@@ -519,23 +519,25 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
 
     let overscrollBehavior = preventOverscroll ? "none" : "auto";
     document.body.style.overscrollBehavior = overscrollBehavior;
-        }
+}
     }
 
-    componentDidUpdate() {
+componentDidUpdate() {
-    }
+}
 
-    componentWillUnmount() {
+componentWillUnmount() {
     super.componentWillUnmount();
+    window.removeEventListener("beforeunload",this.unmountListener);
+
     this.model_.errorMessage.removeOnChangedHandler(this.errorChangeHandler_);
     this.model_.state.removeOnChangedHandler(this.stateChangeHandler_);
     this.model_.pedalboard.removeOnChangedHandler(this.presetChangedHandler);
     this.model_.banks.removeOnChangedHandler(this.banksChangedHandler);
     this.model_.banks.removeOnChangedHandler(this.showStatusMonitorHandler);
 
-    }
+}
 
-    alertMessageChangedHandler() {
+alertMessageChangedHandler() {
     let message = this.model_.alertMessage.get();
     if (message === "") {
         this.setState({ alertDialogOpen: false });
@@ -547,8 +549,8 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
         });
     }
 
-    }
+}
-    updateResponsive() {
+updateResponsive() {
     // functional, but disabled.
     // let tinyToolBar_ = this.windowSize.height < 600;
     // this.setState({ tinyToolBar: tinyToolBar_ });
@@ -564,41 +566,40 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
     if (bankEntries > 7) bankEntries = 7;
     this.setState({ bankDisplayItems: bankEntries });
 
-    }
+}
-    onWindowSizeChanged(width: number, height: number): void {
+onWindowSizeChanged(width: number, height: number): void {
     super.onWindowSizeChanged(width, height);
     this.updateResponsive();
-    }
+}
 
 
-    setErrorMessage(message: string): void {
+setErrorMessage(message: string): void {
     this.setState({ errorMessage: message });
-    }
+}
 
 
-    setDisplayState(newState: State): void {
+setDisplayState(newState: State): void {
     this.updateOverscroll();
 
     this.setState({
         displayState: newState,
         canFullScreen: supportsFullScreen() && !this.model_.isAndroidHosted()
     });
-        if (newState === State.Ready)
+    if(newState === State.Ready)
-        {
+{
-            if (this.model_.isOnboarding())
+    if (this.model_.isOnboarding()) {
-            {
         this.handleDisplayOnboarding();
     }
-        }
+}
     }
 
-    showDrawer() {
+showDrawer() {
     this.setState({ isDrawerOpen: true })
-    }
+}
-    hideDrawer() {
+hideDrawer() {
     this.setState({ isDrawerOpen: false })
-    }
+}
-    shortBankList(banks: BankIndex): BankIndexEntry[] {
+shortBankList(banks: BankIndex): BankIndexEntry[] {
     let n = this.state.bankDisplayItems;
     let entries = banks.entries;
     if (entries.length < n + 1) {  // +1 for the .... entry.
@@ -624,15 +625,15 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
         }
     }
     return result;
-    }
+}
-    handleReload() {
+handleReload() {
     if (this.model_.isAndroidHosted()) {
         this.model_.chooseNewDevice();
     } else {
         window.location.reload();
     }
-    }
+}
-    render() {
+render() {
 
     const { classes } = this.props;
 
@@ -850,7 +851,7 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
                     </Button>
                 </DialogActions>
             </Dialog>
-                { this.state.showStatusMonitor && (<JackStatusView />) }
+            {this.state.showStatusMonitor && (<JackStatusView />)}
 
             <div className={classes.errorContent} style={{
                 display: (this.state.displayState === State.Reconnecting || this.state.displayState === State.ApplyingChanges)
@@ -909,7 +910,7 @@ const AppThemed = withStyles(appStyles)(class extends ResizeResponsiveComponent<
 
         </div >
     );
-    }
+}
 }
 );
 

react/src/Lv2Plugin.tsx

@@ -161,7 +161,7 @@ export class UiFileType {
         } else {
             // chrome desktop thinks "application/octet-stream" is .exe, .com, or .bat.
             // Feed it file extensions isntead.
-            if (result = "application/octet-stream")
+            if (result === "application/octet-stream")
             {
                 result = "";
                 for (let i = 0; i < fileTypes.length; ++i)

react/src/PiPedalModel.tsx

@@ -957,8 +957,8 @@ export class PiPedalModel //implements PiPedalModel
 
     }
     enterBackgroundState() {
-        // on Android, delay entering background state by 3 seconds,
+        // on Android, delay entering background state by 180 seconds,
-        // so that screen-flips don't trigger disconnects.
+        // since background management is more complicated. e.g. screen flips, and system upload dialogs.
 
         if (this.isAndroidHosted()) {
             if (this.backgroundStateTimeout) {
@@ -967,7 +967,7 @@ export class PiPedalModel //implements PiPedalModel
             this.backgroundStateTimeout = setTimeout(() => {
                 this.backgroundStateTimeout = undefined;
                 this.enterBackgroundState_();
-            }, 3000);
+            }, 180000);
         } else {
             this.enterBackgroundState_();
         }

src/PluginHost.cpp

@@ -71,26 +71,6 @@ namespace pipedal
 
     static const char *LV2_MIDI_PLUGIN = "http://lv2plug.in/ns/lv2core#MIDIPlugin";
 
-    // static const char *LV2_AUDIO_PORT = P_LV2_CORE_URI "AudioPort";
-    // static const char *LV2_PLUGIN = P_LV2_CORE_URI "Plugin";
-    // static const char *LV2_CONTROL_PORT = P_LV2_CORE_URI "ControlPort";
-    // static const char *LV2_INPUT_PORT = P_LV2_CORE_URI "InputPort";
-    // static const char *LV2_OUTPUT_PORT = P_LV2_CORE_URI "OutputPort";
-    // static const char *LV2_INTEGER = P_LV2_CORE_URI "integer";
-    // static const char *LV2_ENUMERATION = P_LV2_CORE_URI "enumeration";
-    // static const char *LV2_PORT_LOGARITHMIC = P_LV2_PPROPS "logarithmic";
-    // static const char *LV2_PORT_RANGE_STEPS = P_LV2_PPROPS "rangeSteps";
-    // static const char *LV2_PORT_TRIGGER = P_LV2_PPROPS "trigger";
-    // static const char *LV2_PORT_DISPLAY_PRIORITY = P_LV2_PPROPS "displayPriority";
-    
-
-    // static const char *LV2_ATOM_PORT = "http://lv2plug.in/ns/ext/atom#AtomPort";
-    // static const char *LV2_ATOM_SEQUENCE = "http://lv2plug.in/ns/ext/atom#Sequence";
-    // static const char *LV2_ATOM_SOUND = "http://lv2plug.in/ns/ext/atom#Sound";
-    // static const char *LV2_ATOM_VECTOR = "http://lv2plug.in/ns/ext/atom#Vector";
-    // static const char *LV2_ATOM_STRING = "http://lv2plug.in/ns/ext/atom#String";
-    // static const char *LV2_MIDI_EVENT = "http://lv2plug.in/ns/ext/midi#MidiEvent";
-    // static const char *LV2_DESIGNATION = "http://lv2plug.in/ns/lv2core#Designation";
 
     class PluginHost::Urids
     {

src/SetWifiConfig.cpp

@@ -28,7 +28,6 @@
 #include "SysExec.hpp"
 #include "WriteTemplateFile.hpp"
 
-
 using namespace pipedal;
 using namespace std;
 
@@ -42,23 +41,22 @@ using namespace std;
 
 #define SYSTEMCTL_BIN "/usr/bin/systemctl"
 
-
 static char DNSMASQ_APD_PATH[] = "/etc/dnsmasq.d/30-pipedal-apd.conf";
 
 static char DNSMASQ_P2P_SOURCE_PATH[] = "/etc/pipedal/config/templates/30-pipedal-p2p.conf";
 
 static char DNSMASQ_P2P_PATH[] = "/etc/dnsmasq.d/30-pipedal-p2p.conf";
 
+static bool IsApdInstalled()
+{
     
-static bool IsApdInstalled() {
     return std::filesystem::exists(DNSMASQ_APD_PATH);
 }
-static bool IsP2pInstalled() {
+static bool IsP2pInstalled()
+{
     return std::filesystem::exists(DNSMASQ_P2P_PATH);
 }
 
-
-
 static void restoreApdDhcpdConfFile()
 {
     // remove the interface wlan0 section.
@@ -135,7 +133,6 @@ static void restoreP2pDhcpdConfFile()
     }
 }
 
-
 static void restoreApdDnsmasqConfFile()
 {
     std::filesystem::path path(DNSMASQ_APD_PATH);
@@ -169,7 +166,6 @@ static void UninstallHostApd()
         sysExec(SYSTEMCTL_BIN " enable wpa_supplicant");
         sysExec(SYSTEMCTL_BIN " start wpa_supplicant");
     }
-
 }
 
 static void UninstallP2p();
@@ -327,29 +323,28 @@ void pipedal::SetWifiConfig(const WifiConfigSettings &settings)
         sysExec("rfkill unblock wlan");
         sysExec(SYSTEMCTL_BIN " daemon-reload");
 
-//        sysExec(SYSTEMCTL_BIN " mask wpa_supplicant");
+        //        sysExec(SYSTEMCTL_BIN " mask wpa_supplicant");
         sysExec(SYSTEMCTL_BIN " stop wpa_supplicant");
 
-        sysExec(SYSTEMCTL_BIN " unmask hostapd");
+        // sysExec(SYSTEMCTL_BIN " unmask hostapd");
-        if (sysExec(SYSTEMCTL_BIN " restart hostapd") != 0)
+        // if (sysExec(SYSTEMCTL_BIN " restart hostapd") != 0)
-        {
+        // {
-            throw PiPedalException("Unable to start the access point.");
+        //     throw PiPedalException("Unable to start the access point.");
-        }
+        // }
-        if (sysExec("systemctl is-active --quiet hostapd") != 0)
+        // if (sysExec("systemctl is-active --quiet hostapd") != 0)
-        {
+        // {
-            throw PiPedalException("Unable to start the access point.");
+        //     throw PiPedalException("Unable to start the access point.");
-        }
+        // }
-        sysExec(SYSTEMCTL_BIN " enable hostapd");
+        // sysExec(SYSTEMCTL_BIN " enable hostapd");
 
         sysExec(SYSTEMCTL_BIN " stop wpa_supplicant");
-//        sysExec(SYSTEMCTL_BIN " mask wpa_supplicant");
+        //        sysExec(SYSTEMCTL_BIN " mask wpa_supplicant");
 
         sysExec(SYSTEMCTL_BIN " restart dnsmasq");
         sysExec(SYSTEMCTL_BIN " enable dnsmasq");
     }
 }
 
-
 /*********************************************************************************
 
 p2p configuration:
@@ -376,7 +371,6 @@ interface p2p-wlan0-0
 Watch resolv.conf to make sure we don't lose DNS servers.
 ************************************************************************************/
 
-
 void UninstallP2p()
 {
     if (IsP2pInstalled())
@@ -390,21 +384,20 @@ void UninstallP2p()
         restoreP2pDhcpdConfFile();
         restoreP2pDnsmasqConfFile();
 
-
         sysExec(SYSTEMCTL_BIN " restart dhcpcd");
 
         WifiDirectConfigSettings wifiDirectConfigSettings;
         wifiDirectConfigSettings.Load();
         wifiDirectConfigSettings.enable_ = false;
         wifiDirectConfigSettings.Save();
-
     }
 }
 
-
 void pipedal::SetWifiDirectConfig(const WifiDirectConfigSettings &settings)
 {
 
+    try
+    {
         char band;
         if (!settings.enable_)
         {
@@ -416,13 +409,12 @@ void pipedal::SetWifiDirectConfig(const WifiDirectConfigSettings &settings)
             deviceIdFile.deviceName = settings.hotspotName_;
             deviceIdFile.Save();
 
-
             // Announce new mDNS service with potentially new deviceName.
             sysExec(SYSTEMCTL_BIN " restart pipedald");
-
         }
         else
         {
+            cout << "Enabling P2P" << endl;
 
             settings.Save();
             // ******************* device_uuid
@@ -441,6 +433,7 @@ void pipedal::SetWifiDirectConfig(const WifiDirectConfigSettings &settings)
             std::filesystem::path dhcpcdConfig("/etc/dhcpcd.conf");
             if (std::filesystem::exists(dhcpcdConfig))
             {
+                cout << "Updating /etc/dhcpcd.conf" << endl;
                 SystemConfigFile dhcpcd(dhcpcdConfig);
 
                 // dhcpcd.conf:
@@ -449,7 +442,6 @@ void pipedal::SetWifiDirectConfig(const WifiDirectConfigSettings &settings)
                 //      static ip_address=172.24.0.1/24
                 //      domain_name_server=172.24.0.1
 
-
                 int line = dhcpcd.GetLineThatStartsWith("hostname");
                 std::string hostNameLine;
                 if (false)
@@ -499,14 +491,13 @@ void pipedal::SetWifiDirectConfig(const WifiDirectConfigSettings &settings)
                 dhcpcd.InsertLine(line++, "interface p2p-wlan0-0");
                 dhcpcd.InsertLine(line++, "   static ip_address=" P2P_INTERFACE_ADDR);
                 dhcpcd.InsertLine(line++, "   nohook wpa_supplicant");
-            //dhcpcd.InsertLine(line++, "   domain_name_servers=" P2P_IP_ADDRESS);
+                // dhcpcd.InsertLine(line++, "   domain_name_servers=" P2P_IP_ADDRESS);
                 dhcpcd.Save(dhcpcdConfig);
             }
 
-
             // **************** start services ************
 
-        cout << "Starting services." << endl;
+            cout << "Starting P2P services." << endl;
             sysExec("rfkill unblock wlan");
 
             sysExec(SYSTEMCTL_BIN " daemon-reload");
@@ -526,6 +517,11 @@ void pipedal::SetWifiDirectConfig(const WifiDirectConfigSettings &settings)
             sysExec(SYSTEMCTL_BIN " enable pipedal_p2pd");
             sysExec(SYSTEMCTL_BIN " restart pipedald");
         }
+    }
+    catch (const std::exception &e)
+    {
+        cout << e.what() << endl;
+    }
 }
 
 void pipedal::OnWifiUninstall()
@@ -534,11 +530,11 @@ void pipedal::OnWifiUninstall()
     if (IsApdInstalled())
     {
         UninstallHostApd();
-    } else if (IsP2pInstalled())
+    }
+    else if (IsP2pInstalled())
     {
         UninstallP2p();
     }
-
 }
 void pipedal::OnWifiInstallComplete()
 {
@@ -551,5 +547,4 @@ void pipedal::OnWifiInstallComplete()
     // {
     //     sysExec(SYSTEMCTL_BIN " daemon-reload");
     // }
-
 }

src/main.cpp

@@ -825,11 +825,13 @@ int main(int argc, char *argv[])
             }
         }
 
-        Lv2Log::info("Shutting down gracefully.");
+        Lv2Log::info("Closing audio session.");
         model.Close();
+        
         Lv2Log::info("Stopping web server.");
         server->ShutDown(5000);
         server->Join();
+
         Lv2Log::info("Shutdown complete.");
     }
     catch (const std::exception &e)

src/templates/30-pipedal-apd.conf

@@ -1,24 +0,0 @@
-/*
- * MIT License
- * 
- * Copyright (c) 2022 Robin E. R. Davies
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-

src/templates/pipedald.service.template

@@ -3,7 +3,6 @@ Description=${DESCRIPTION}
 After=network.target
 After=sound.target
 After=local-fs.target
-After=avahi-daemon