diff --git a/docs/Configuring.md b/docs/Configuring.md index 086dfd1..dc5db78 100644 --- a/docs/Configuring.md +++ b/docs/Configuring.md @@ -20,15 +20,15 @@ An RT_PREEMPT kernel provides slightly better realtime audio than a PREEMPT_DYNA ## Support for WIFI Auto-Hotspots on Ubuntu Server The following information applies when installing PiPedal on Ubuntu Server 24.0x only. This information does not apply -to Unbuntu Desktop installs or Raspberry Pi OS Lite installs. +to Unbuntu Desktop installs or Raspberry Pi OS Lite installs, which use the Network Manager TCP/IP stack by default. PiPedal's Auto-Hotspot feature only works on Linux systems that are using the Network Manager network services stack. Ubuntu Server 24.x (and probably other server-specific installs on other Debian distros) uses the Netplan network services stack by instead. It does so because the Netplan network stack is the preferred network stack when managing farms of cloud servers. It's easy enough to reconfigure Ubuntu Server to run the Network Manager network stack instead. However you should be -aware that Netplan TCP/IP configuration settings will not be migrated to Network Manager. If you perform this step on a server on which changes have beeen madce to Netplan configuration files, you will need to manually migrate those -changes to Network Manager configuration files. On a clean install of Ubuntu Server, this will not be a problem. +aware that Netplan TCP/IP configuration settings will not be migrated to Network Manager. If you perform this step on a server on which changes have beeen made to Netplan configuration files, you will lose those configuration changes, and will need to reimplement them in Network Manager. If you are +a Netplan configuration (or are working with a clean install), then the default Network Manager configuration will work perfectly well too. To reconfigure Ubuntu Server to use the Network Manager network stack (and therefore enable PiPedal's Auto-Hotspot feature), run the following command: @@ -123,11 +123,33 @@ The following table shows measured round-trip audio latencies for a MOTU M2 exte 128442/9.2ms571/11.9ms699/14.6ms -LINUX Kernel version 5.16 includes fixes to ALSA audio that are supposed to dramatically improve USB audio latency. As of July 2022, these fixes have not yet made it into Raspberry Pi OS, but are probably available on non-LTS versions of Ubuntu. +Selecting 2 buffers provides lower latency, but leaves very little CPU time for audio processing, so you may experience more underruns if +you select 2. Selecting 4 buffers provides much more time for proessing. Using a buffer size of 16 increases CPU load slightly, since there a +certain amoung of CPU overhead associated with handling of each buffer. That being said, 16x4 audio buffer configuration is a highly recommended +choice if your audio adapter can support it. It provides excellent latency with very little chance of overruns. -PiPedal uses the ALSA audio stack; so (unlike Jack Audio) there is no performance penalty for using 44100Hz sample rates. However, using a 48000Hz sampling rates does provide significant improvements in high-frequency audio quality when performing digital audio signal processing. +All things being equal, you should perfer 48000hz sample rates to 44100Hz sample rates. The higher sample rate makes it easier for plugins to implement +audio effects without high-frequency artifacts; and Nueral Amp Models are usually designed to work best at 48000Hz sample rates. -### Activating the Wi-Fi Auto-Hotspot +### Configuring Input Trim Levels on Older USB Audio Devices + +For best results, you should set the input gain of your audio device so that the signal level is as high as possible without clipping. If you click on the +input node of a preset, the left VU meter will show the audio input levels as received directly from your audio adapter. + +Some older USB audio devices do not provide volume knobs to control input gain of the audio signal, and the default trim settings are often less than +ideal. To configure the input gain on these devices, use the following procedure. + +- ssh to the host, or launch a terminal window on the host if you have configured your Raspberry Pi to boot to a graphical desktop. +- Run `alsamixer` to configure the input gain. +- Press F6 to select the sound card. +- Press TAB to scroll across pages/channels until you reach the CAPTURE slider(s). +- Connect and play your instrument, while watch the input VU meter in the PiPedal UI. Use the UP and DOWN arrow keys to adjust the input gain. +- Press the ESC key to close alsa mixer. +- Run `sudo alsactl store` to save the settings permanantly. + + + +## Activating the Wi-Fi Auto-Hotspot The PiPedal Auto-Hotspot feature allows you to connect to your Raspberry Pi even if you don't have access to a Wi-Fi router. For example, if you are performing at a live venue, you probably will not @@ -188,14 +210,12 @@ automatically connect to your laptop hotspot whenever it sees it, after you have credentials on your Raspberry Pi. After the first time, all you need to do is turn on your laptop hotspot, and Raspberry Pi OS will connect to it. -Usually, you cannect from your laptop using the same web address: http://raspberrpi (or the hostname of your raspberry pi, if you have -changed it). Unlike Android phones (where mDNS name resolution doesn't work on Android-hosted hotspots), mDNS/Bonjour name resolution usually +Usually, you can conect from your laptop using the same web address: `http://raspberrypi` (`http://raspberrypi.local` on Ubuntu), or the hostname of your raspberry pi, if you have changed it. Unlike Android phones (where mDNS name resolution doesn't work on Android-hosted hotspots), mDNS/Bonjour name resolution usually works on laptop-hosted hotspots when using Windows or Mac OS. If are running Linux on your laptop, you may need to install and configure the Avahi package to get mDNS/Bonjour name resolution to work. And if that doesn't work, you can configure PiPedal to launch an auto-hotspot, and then connect from your laptop to the PiPedal hotspot on your Raspberry Pi. -When the Raspberry Pi hosts the hotspot, mDNS discovery is definitely enabled; so you should be able to connect using http://raspberrypi. But if that doesn't work, PiPedal's IP address will always be 10.40.1, when the PiPedal Wi-Fi hotspot is running, so you can always connect using http://10.40.0.1. - +When the Raspberry Pi hosts the hotspot, mDNS discovery is definitely enabled; so you should be able to connect using http://raspberrypi. But if that doesn't work, PiPedal's IP address will always be 10.40.0.1, when the PiPedal Wi-Fi hotspot is running, so you can always connect using http://10.40.0.1. -------- diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md index bc2cc7c..8002ffa 100644 --- a/docs/ReleaseNotes.md +++ b/docs/ReleaseNotes.md @@ -6,7 +6,7 @@ ## PiPedal 1.4.71 Beta -- Resolves installation issues on Ubuntu Server. +- Resolves installation issues on Ubuntu Server./ ## PiPedal 1.4.70 Beta diff --git a/lv2/aarch64/ToobAmp.lv2/CabIR.ttl b/lv2/aarch64/ToobAmp.lv2/CabIR.ttl index d5dd122..208974c 100644 --- a/lv2/aarch64/ToobAmp.lv2/CabIR.ttl +++ b/lv2/aarch64/ToobAmp.lv2/CabIR.ttl @@ -93,7 +93,7 @@ cabir:impulseFile3 doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; rdfs:comment """ TooB Cab IR is a convolution-based guitar cabinet impulse response simulator. @@ -274,7 +274,7 @@ Limitations of Liability that apply to these works. lv2:name "Predelay"; lv2:portProperty epp:notOnGUI; - lv2:default 0 ; + lv2:default 0.0 ; lv2:minimum 0 ; lv2:maximum 1 ; diff --git a/lv2/aarch64/ToobAmp.lv2/CabSim.ttl b/lv2/aarch64/ToobAmp.lv2/CabSim.ttl index ecf7f81..89ad50a 100644 --- a/lv2/aarch64/ToobAmp.lv2/CabSim.ttl +++ b/lv2/aarch64/ToobAmp.lv2/CabSim.ttl @@ -22,6 +22,7 @@ @prefix urid: . @prefix xsd: . @prefix pipedal_ui: . +@prefix pipedal_patch: . @prefix toob: . @prefix cabsim: . @@ -49,13 +50,13 @@ toob:frequencyResponseVector doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; mod:brand "TooB"; mod:label "TooB CabSim"; lv2:requiredFeature urid:map ; lv2:optionalFeature lv2:hardRTCapable; - patch:readable + pipedal_patch:readable toob:frequencyResponseVector; rdfs:comment """ diff --git a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl b/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl index d347d53..62264fd 100644 --- a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ConvolutionReverb.ttl @@ -53,7 +53,7 @@ toobimpulse:impulseFile doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; 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 index 6f6ee24..94a55d7 100644 --- a/lv2/aarch64/ToobAmp.lv2/ConvolutionReverbStereo.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ConvolutionReverbStereo.ttl @@ -51,7 +51,7 @@ toobimpulse:impulseFile doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; rdfs:comment """ diff --git a/lv2/aarch64/ToobAmp.lv2/InputStage.ttl b/lv2/aarch64/ToobAmp.lv2/InputStage.ttl index e1c1e74..1c7fb2e 100644 --- a/lv2/aarch64/ToobAmp.lv2/InputStage.ttl +++ b/lv2/aarch64/ToobAmp.lv2/InputStage.ttl @@ -24,6 +24,7 @@ @prefix pg: . @prefix pipedal_ui: . +@prefix pipedal_patch: . @prefix toob: . @prefix inputStage: . @@ -65,16 +66,14 @@ inputStage:filterGroup doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; mod:brand "TooB"; mod:label "TooB Input"; lv2:requiredFeature urid:map ; lv2:optionalFeature lv2:hardRTCapable; - patch:writable - ; - patch:readable + pipedal_patch:readable ; rdfs:comment """ @@ -282,8 +281,6 @@ The GateT control provides a noise gate. Set to minimum value to disable. lv2:extensionData uiext:resize ; lv2:extensionData uiext:idleInterface; lv2:requiredFeature uiext:idleInterface ; - patch:writable - ; . diff --git a/lv2/aarch64/ToobAmp.lv2/PowerStage2.ttl b/lv2/aarch64/ToobAmp.lv2/PowerStage2.ttl index f99f60b..d8b5246 100644 --- a/lv2/aarch64/ToobAmp.lv2/PowerStage2.ttl +++ b/lv2/aarch64/ToobAmp.lv2/PowerStage2.ttl @@ -25,6 +25,7 @@ @prefix modgui: . @prefix pstage: . +@prefix pipedal_patch: . pstage:stage1 a param:ControlGroup , @@ -67,13 +68,13 @@ pstage:stage3 doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; mod:brand "TooB"; mod:label "Power Stage"; lv2:requiredFeature urid:map ; lv2:optionalFeature lv2:hardRTCapable; - patch:readable + pipedal_patch:readable ; rdfs:comment """ diff --git a/lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl b/lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl index cc895f1..81cb244 100644 --- a/lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl +++ b/lv2/aarch64/ToobAmp.lv2/SpectrumAnalyzer.ttl @@ -13,6 +13,7 @@ @prefix mod: . @prefix param: . @prefix work: . +@prefix pipedal_patch: . @prefix atom: . @prefix patch: . @@ -49,16 +50,14 @@ ; uiext:ui ; - patch:writable - ; - patch:readable + pipedal_patch:readable ; doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; rdfs:comment "TooB spectrum analyzer" ; mod:brand "TooB"; diff --git a/lv2/aarch64/ToobAmp.lv2/ToneStack.ttl b/lv2/aarch64/ToobAmp.lv2/ToneStack.ttl index a150f92..956cb3f 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToneStack.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToneStack.ttl @@ -23,6 +23,8 @@ @prefix xsd: . @prefix pipedal_ui: . +@prefix pipedal_patch: . + @prefix toob: . @prefix tonestack: . @@ -55,7 +57,7 @@ tonestack:eqGroup doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; uiext:ui ; @@ -68,7 +70,7 @@ tone stack used in Polytone and HiWatt amps. mod:label "Tone Stack"; lv2:requiredFeature urid:map ; lv2:optionalFeature lv2:hardRTCapable; - patch:readable + pipedal_patch:readable toob:frequencyResponseVector; diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so b/lv2/aarch64/ToobAmp.lv2/ToobAmp.so index e6e2914..a9407d4 100644 Binary files a/lv2/aarch64/ToobAmp.lv2/ToobAmp.so and b/lv2/aarch64/ToobAmp.lv2/ToobAmp.so differ diff --git a/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so b/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so index 6ccd10e..6eab916 100644 Binary files a/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so and b/lv2/aarch64/ToobAmp.lv2/ToobAmpUI.so differ diff --git a/lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl b/lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl index 7d7b0bf..55a70b7 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobChorus.ttl @@ -40,7 +40,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; 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 index 1faeb88..55b3647 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobDelay.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobDelay.ttl @@ -41,7 +41,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; rdfs:comment """ A straightforward no-frills digital delay. diff --git a/lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl b/lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl index bce6f3c..a90af50 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobFlanger.ttl @@ -41,7 +41,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; rdfs:comment """ Emulation of a Boss BF-2 Flanger, based on circuit analysis and simulation of the original. @@ -99,6 +99,7 @@ Emulation of a Boss BF-2 Flanger, based on circuit analysis and simulation of th lv2:symbol "lfo" ; lv2:name "LFO"; + lv2:portProperty epp:notOnGUI; lv2:minimum -1.0 ; lv2:maximum 1.0 ; ], diff --git a/lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl b/lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl index c291c3b..4c9fc37 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobFlangerStereo.ttl @@ -41,7 +41,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; rdfs:comment """ Digital emulation of a Boss BF-2 Flanger. @@ -99,6 +99,7 @@ should use the monophonic version of this effect. a lv2:OutputPort , lv2:ControlPort ; + lv2:portProperty epp:notOnGUI; lv2:index 3 ; lv2:symbol "lfo" ; lv2:name "LFO"; diff --git a/lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl b/lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl index 77575e2..2469862 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobFreeverb.ttl @@ -41,7 +41,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; 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/ToobLooperFour.ttl b/lv2/aarch64/ToobAmp.lv2/ToobLooperFour.ttl new file mode 100644 index 0000000..42284ce --- /dev/null +++ b/lv2/aarch64/ToobAmp.lv2/ToobLooperFour.ttl @@ -0,0 +1,915 @@ +@prefix doap: . +@prefix lv2: . +@prefix rdfs: . +@prefix rdf: . +@prefix units: . +@prefix urid: . +@prefix atom: . +@prefix midi: . +@prefix uiext: . +@prefix idpy: . +@prefix foaf: . +@prefix mod: . +@prefix param: . +@prefix work: . +@prefix pg: . +@prefix atom: . +@prefix patch: . +@prefix state: . +@prefix urid: . +@prefix xsd: . +@prefix ui: . +@prefix pprop: . +@prefix pipedal_ui: . + + +@prefix looperPrefix: . + +@prefix myprefix: . + + +myprefix:stereoInGroup + a pg:StereoGroup, pg:InputGroup ; + rdfs:label "Stereo Input" ; + lv2:symbol "in_g" . + +myprefix:steroOutGroup a pg:Group ; + a pg:StereoGroup, pg:OuputGroup ; + rdfs:label "Stereo Output" ; + lv2:symbol "out_g" . + + +myprefix:syncGroup + a pg:ControlGroup ; + lv2:name "Clock" ; + lv2:symbol "sync_g" . + + +myprefix:loop_main_group + a pg:ControlGroup ; + lv2:name "Main Loop" ; + lv2:symbol "loop_main_group" . + +myprefix:loop2_group + a pg:ControlGroup ; + lv2:name "Loop 2" ; + lv2:symbol "loop2_group" . + +myprefix:loop3_group + a pg:ControlGroup ; + lv2:name "Loop 3" ; + lv2:symbol "loop3_group" . + +myprefix:loop4_group + a pg:ControlGroup ; + lv2:name "Loop 4" ; + lv2:symbol "loop4_group" . + +myprefix:options_group + a pg:ControlGroup ; + lv2:name "Record Options" ; + lv2:symbol "options_group" . + +myprefix:output_group + a pg:ControlGroup ; + lv2:name "Output" ; + lv2:symbol "output_group" . + + + + + a foaf:Person ; + foaf:name "Robin Davies" ; + foaf:mbox ; + foaf:homepage . + + + + a lv2:Plugin , + lv2:UtilityPlugin ; + doap:name "TooB 4Looper (stereo)" + ; + doap:license ; + doap:maintainer ; + lv2:minorVersion 1 ; + lv2:microVersion 58 ; + + ui:ui ; + + lv2:extensionData state:interface ; + + rdfs:comment """ +## Toob 4Looper + +A 4-channel looper. If you are using a MIDI foot controller, you may want to consider using Toob One-Control looper, which allows control of +looping using a single footswitch. TooB 4Looper does support MIDI control using four footswitches. See the Midi Operation section below for +more information. + +### Basic Operation + +You must record a main loop before loops 2 through 4 are available. + +To start recording the main loop, press the Main Loop record button. The red Record LED will light up to indicate that the main loop is recording. +You can configure TooB 4Looper to use a variable length main loop, or a fixed length loop. See the documentation on the Bars control for more +information on how to use a fixed-length loop. If the Bars control is set to "Free", the length of the main loop will be established when +you next press the Record or Play button after the main loop has started recording. Pressing the record button will mark the end of the +loop, and continue on in Overdub mode. Pressing the Play button will mark the end of the loop, and start playback. + +Once the main loop has been established, you can toggle back and forth between Overdub and Play modes by pressing the Record and Play buttons +resepectively. + +You can also mute the loop by going to Play mode, and pushing the Play button once more. Pushing the Play button while in Mute mode will +re-enable audio output from the loop. + +Pressing the Main Loop stop buton will stop playback of of all loops, and return the looper to its initial state. + +To record a secondary loop, press the Record button for the loop you want to record. The Record LED will light up to indicate that the loop +is recording. If the Rec Sync option is enabled, the loop will go to Cue Overdub mode, and once the main loop reaches the end of its loop, +the loop will switch to Record mode. If the Rec Sync option is disabled, the loop will start recording immediately. The length of secondary +loops will always be the same as the length of the main loop. Once the loop has started, pressing the play button will start playback. +Pressing the record button will overdub content of the loop. In Play mode, pushing the Play button again will mute the loop. Pressing +the Play button when the loop is muted will re-enable audio output from the loop. Pressing the Stop button will stop playback, and erase +the contents of the loop. There is no concept of "undoing" individual overdubs in TooB 4Looper. If you're done with a loop, just erase it. + +### Clock Options + +Clock options determine the tempo and number of beats in a bar. They affect the behavior of the looper when the Bars control (see below) is set to +a numeric value, and also affect the rate and pattern of the flashing LEDs when counting in. + +### Record Options + +Record Options control the behavior of the looper. + +When Count In is enabled, The looper will Count In before starting the main loop. The Record LED will flash when counting in, and go solid +once recording starts. The pattern of blinking lights depends on the TimeSig setting, so for example, if the Time Signature is set to 4/4, the +blinking LED will signal a count-in pattern of "1 - 2 - 1 2 3 4". + +When Bars is set to Free (the minimum value), the length of the main loop will be set by a second tap of the +Control button after recording of the main loop starts. If Bars is set to a numeric value, the length of the main loop will be determined by the number +of bars set in the Bars control, and the current settings of the Clock controls. + +If Dub Sync is off, overdubs will start recording as soon as you tap the Control button. If enabled, the start +of the secondary loop will sync with main loop. Tapping the Control button will put the looper in "Cue Overdub" state +and the LEDs will flash until the end of the main loop is reached, at which point the new loop will start recording. + +The Loop End option only has effect when the Bars control is set to a numeric value, and does nothing if Bars is set to "Free". +When set to REC-PLAY, the main loop will record exactly N bars of audio, and switch to play mode when the end of the loop is reached. +When set to REC-DUB, the main loop will record exactly N bars of audio, and then continue on in overdub mode. + + +### MIDI Operation + +If you want to control your looper with one foot controller switch, please use Toob One-Control Looper instead. Toob 4Looper +allows you to control loops with four foot controller switches (one for each loop). In order to do this, TooB 4Looper provides +a hidden controls only visible in PiPedal's MIDI Bindings user-interface. The hidden controls are named `Midi CTL`; there's one +control for each loop. A single tap of the control will cause the loop to start +recording or playing or overdubbing, depending on the state of the loop. Long-pressing the control will erase the loop. Erasing the main loop +will stop all playback, erasing all other loops as well, and return the Toob 4Looper to its initial state. + +To use the hidden controls, you must bind each of them to your MIDI controller's footswitches. It is recommended that you configure +your MIDI controller to send MIDI Note-on/Note off messages. You can bind the controls to MIDI CC messages as well, but the behavior +of your controller may not match what TooB 4Looper expects. If you must use MIDI CC messages, you should configure your MIDI +controller to set a CC value of zero when not pressed, and a value of 127 when pressed, and adjust PiPedal's MIDI bindings appropriately. + +The following state table controls how the hidden controls operate. Each loop has an independent state. + +### State Table for Looop Operations + +The following table describes state transitions for each loop. Note that loops 2 to 4 are not available until the main loop has been recorded. + +``` ++-----------+--------------+----------------------------------+ +| State | Action | Effect | +|-----------|--------------|----------------------------------| +| Empty | Record / | Start counting in if COUNT IN is | +| | Control Tap | enabled; otherwise start | +| | | recording immediately. | +|-----------|--------------|----------------------------------| +| Count-In | Stop / | Return to empty state | +| | Long-press | | +| | | | +| | Complete | Start recording | +|-----------|--------------|----------------------------------| +| Recording | Play | Set the loop length (main loop | +| | | only_) and go to play state . | +| | | | +| | Record | Set the loop length (main loop | +| | | only_) and go to Overdub state . | +| | | | +| | Stop/ | Discard the current loop and | +| | Long-Press | return to Empty state | +| | | | +| | Control Tap | Set the loop length (main loop | +| | | only_) and go to play or Overdub | +| | | state depending on ON REC END. | +| | | | +| | End of loop | go to play or overdub state | +| | | depending on ON REC END | +|-----------|--------------|----------------------------------| +| Playing | Record / Tap | If DUB SYNC is on, go to | +| | | Cue Ovdb state; otherwise | +| | | start overdubbing immediately. | +| | | | +| | Play | Mute the loop, and go to Mute | +| | | state. | +| | | | +| | Stop / | Discard the current loop and go | +| | Long-press | to Empty state. | +|-----------|--------------|----------------------------------| +| Mute | Play / Tap | Unmute the loop and go to Play | +| | | state. | +| | | | +| | Record | Start overdubbing. | +| | | | +| | Stop / | Discard the current loop and go | +| | Long-press | to Empty state. | +|-----------|--------------|----------------------------------| +| Cue Ovdb | End-of-loop | Start overdubbing. | +| | | | +| | Tap | Cancel the pending overdub. | +| | | | +| | Long-press | Discard the current loop and go | +| | | to Empty state. | +|-----------|--------------|----------------------------------| +| Overdub | Play / Tap | Start playing. | +| | | | +| | End of loop | (If DUB SYNC is on, and | +| | | REC->PLAY is selected) Go to | +| | | play state, otherwise, continue | +| | | in overdub state. | ++-----------|--------------|----------------------------------+ +``` + + + +""" ; + + mod:brand "TooB"; + mod:label "4Looper"; + lv2:optionalFeature lv2:hardRTCapable; + + lv2:port + ################# MAIN Loop + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 0; + lv2:symbol "control1" ; + lv2:name "MIDI Ctl"; + rdfs:comment "Hidden control for MIDI operation. See documentation for details."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:integer, lv2:toggled, mod:preferMomentaryOffByDefault, pprop:notOnGUI; + + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 1; + lv2:symbol "stop1" ; + lv2:name "⏹"; + rdfs:comment "Reset all loops."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 2; + lv2:symbol "record1" ; + lv2:name "⏺"; + rdfs:comment "Recording/overdub the main loop"; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 3; + lv2:symbol "record_led1" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 4; + lv2:symbol "play1" ; + lv2:name "⏵"; + rdfs:comment "Play Loop 1. Click again to stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 5; + lv2:symbol "play_led1" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 6; + lv2:symbol "position1" ; + rdfs:comment "Time"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + units:unit units:pc ; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 1.0 ; + pg:group myprefix:loop_main_group ; + ], + + + ################# Loop2 + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 7; + lv2:symbol "control2" ; + lv2:name "MIDI Ctl"; + rdfs:comment "Hidden control for MIDI operation. See documentation for details."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:integer, lv2:toggled, mod:preferMomentaryOffByDefault, pprop:notOnGUI; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 8; + lv2:symbol "stop2" ; + lv2:name "⏹"; + rdfs:comment "Reset loop 2."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 9; + lv2:symbol "record2" ; + lv2:name "⏺"; + rdfs:comment "Record/Overdub loop 2"; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 10; + lv2:symbol "record_led2" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 11; + lv2:symbol "play2" ; + lv2:name "⏵"; + rdfs:comment "Play Loop 2. Click again to stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 12; + lv2:symbol "play_led2" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 13; + lv2:symbol "position2" ; + rdfs:comment "Time"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + units:unit units:pc ; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 1.0 ; + pg:group myprefix:loop2_group ; + ], + + ################# Loop3 + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 14; + lv2:symbol "control3" ; + lv2:name "MIDI Ctl"; + rdfs:comment "Hidden control for MIDI operation. See documentation for details."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:integer, lv2:toggled, mod:preferMomentaryOffByDefault, pprop:notOnGUI; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 15; + lv2:symbol "stop3" ; + lv2:name "⏹"; + rdfs:comment "Reset loop 3."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 16; + lv2:symbol "record3" ; + lv2:name "⏺"; + rdfs:comment "Record/Overdub loop 3"; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 17; + lv2:symbol "record_led3" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 18; + lv2:symbol "play3" ; + lv2:name "⏵"; + rdfs:comment "Play Loop 3. Click again to stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 19; + lv2:symbol "play_led3" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 20; + lv2:symbol "position3" ; + rdfs:comment "Time"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + units:unit units:pc ; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 1.0 ; + pg:group myprefix:loop3_group ; + ], + + + ################# Loop4 + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 21; + lv2:symbol "control4" ; + lv2:name "Midi Ctl"; + rdfs:comment "Hidden control for MIDI operation. See documentation for details."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:integer, lv2:toggled, mod:preferMomentaryOffByDefault, pprop:notOnGUI; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 22; + lv2:symbol "stop4" ; + lv2:name "⏹"; + rdfs:comment "Reset loop 4."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 23; + lv2:symbol "record4" ; + lv2:name "⏺"; + rdfs:comment "Record/Overdub loop 4"; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 24; + lv2:symbol "record_led4" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 25; + lv2:symbol "play4" ; + lv2:name "⏵"; + rdfs:comment "Play Loop 4. Click again to stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 26; + lv2:symbol "play_led4" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 27; + lv2:symbol "position4" ; + rdfs:comment "Time"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + units:unit units:pc ; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 1.0 ; + pg:group myprefix:loop4_group ; + ], + + + ###### Sync + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 28; + lv2:symbol "bar_led" ; + lv2:name "\u00A0\u00A0Bar\u00A0\u00A0"; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:syncGroup ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 29; + lv2:symbol "beat_led" ; + lv2:name "\u00A0Beat\u00A0"; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:syncGroup ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 30; + lv2:symbol "tempo" ; + lv2:name "Tempo"; + lv2:default 120.0 ; + lv2:minimum 40.0; + lv2:maximum 240.0; + units:unit units:bpm; + rdfs:comment "Tempo in quarter-notes per minute" + ; pg:group myprefix:syncGroup + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 31 ; + lv2:symbol "timesig" ; + rdfs:comment "Time Signature"; + lv2:name "TimeSig"; + lv2:default 2 ; + lv2:minimum 0; + lv2:maximum 5; + lv2:portProperty lv2:enumeration ; + + lv2:scalePoint [ + rdfs:label "2/2" ; + rdf:value 0 + ] , [ + rdfs:label "3/4" ; + rdf:value 1 + ] , [ + rdfs:label "4/4" ; + rdf:value 2 + ] , + [ + rdfs:label "5/4" ; + rdf:value 3 + ] , + [ + rdfs:label "6/8" ; + rdf:value 4 + ] , + [ + rdfs:label "7/4" ; + rdf:value 5 + ]; + pg:group myprefix:syncGroup + ], + + ########## Options + + [ + lv2:name "Count In" ; + + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 32; + lv2:symbol "rec_count_in" ; + lv2:default 1.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled; + rdfs:comment "Whether to count in when starting the main loop."; + + pg:group myprefix:options_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 33 ; + lv2:symbol "bars" ; + lv2:name "Bars"; + lv2:default 0.0 ; + lv2:minimum 0; + lv2:maximum 32; + units:unit units:bar ; + lv2:portProperty lv2:integer; + rdfs:comment "Loop length in bars. Set to minimum for arbitrary length loops."; + pg:group myprefix:options_group ; + lv2:scalePoint [ + rdfs:label "Free" ; + rdf:value 0.0 + ] + ], + [ + lv2:name "Rec Sync" ; + + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 34; + lv2:symbol "rec_sync_option" ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled; + rdfs:comment "Whether to sync the start of the loop with the main loop when recording secondary loops."; + + pg:group myprefix:options_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 35; + lv2:symbol "loop_end_option" ; + lv2:name "On Rec End"; + lv2:default 1.0 ; + lv2:minimum 1.0; + lv2:maximum 2.0; + lv2:portProperty lv2:enumeration; + rdfs:comment "(One-control MIDI operation only) Whether to go to OVERDUB or PLAY state when recording of the main loop ends."; + + lv2:scalePoint [ + rdfs:label "REC->PLAY" ; + rdf:value 1.0 + ] , [ + rdfs:label "REC->DUB" ; + rdf:value 2.0 + ] ; + + pg:group myprefix:options_group ; + ], + + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 36; + lv2:symbol "level" ; + lv2:name "Level"; + lv2:name "Level"; + pg:group myprefix:output_group ; + + lv2:default 0.0 ; + lv2:minimum -60.0; + lv2:maximum 30.0; + lv2:scalePoint [ + rdfs:label "-INF" ; + rdf:value -60.0 + ]; + units:unit units:db + ], + + ################# Audio/Control Busses + + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 37 ; + lv2:symbol "in" ; + lv2:name "In"; + pg:group myprefix:stereoInGroup ; + lv2:designation pg:left + + ], + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 38 ; + lv2:symbol "out" ; + lv2:name "Out" ; + pg:group myprefix:stereoOutGroup ; + lv2:designation pg:left + ], + + [ + a atom:AtomPort , + lv2:InputPort ; + lv2:index 39 ; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + + lv2:symbol "controlIn" ; + lv2:name "ControlIn" + ], + [ + a atom:AtomPort , + lv2:OutputPort ; + lv2:index 40 ; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + lv2:symbol "controlOut" ; + lv2:name "ControlOut" + ], + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 41; + lv2:symbol "inR" ; + lv2:name "InR" ; + pg:group myprefix:stereoInGroup ; + lv2:designation pg:right + + ], + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 42 ; + lv2:symbol "outR" ; + lv2:name "OutR" ; + pg:group myprefix:stereoOutGroup ; + lv2:designation pg:right + ] + + + ; + + . + + + + + a ui:X11UI ; + lv2:binary ; + + lv2:extensionData ui:resize ; + lv2:extensionData ui:idleInterface ; + lv2:requiredFeature ui:idleInterface ; +. + + diff --git a/lv2/aarch64/ToobAmp.lv2/ToobLooperOne.ttl b/lv2/aarch64/ToobAmp.lv2/ToobLooperOne.ttl new file mode 100644 index 0000000..c1f349a --- /dev/null +++ b/lv2/aarch64/ToobAmp.lv2/ToobLooperOne.ttl @@ -0,0 +1,606 @@ +@prefix doap: . +@prefix lv2: . +@prefix rdfs: . +@prefix rdf: . +@prefix units: . +@prefix urid: . +@prefix atom: . +@prefix midi: . +@prefix epp: . +@prefix idpy: . +@prefix foaf: . +@prefix mod: . +@prefix param: . +@prefix work: . +@prefix pg: . +@prefix atom: . +@prefix patch: . +@prefix state: . +@prefix urid: . +@prefix xsd: . +@prefix ui: . +@prefix uiext: . +@prefix pprop: . +@prefix pipedal_ui: . + +@prefix myprefix: . + + +myprefix:stereoInGroup + a pg:StereoGroup, pg:InputGroup ; + rdfs:label "Stereo Input" ; + lv2:symbol "in_g" . + +myprefix:steroOutGroup a pg:Group ; + a pg:StereoGroup, pg:OuputGroup ; + rdfs:label "Stereo Output" ; + lv2:symbol "out_g" . + + +myprefix:syncGroup + a pg:ControlGroup ; + lv2:name "Clock" ; + lv2:symbol "sync_g" . + + +myprefix:loop_main_group + a pg:ControlGroup ; + lv2:name "Control" ; + lv2:symbol "loop_main_group" . + + +myprefix:options_group + a pg:ControlGroup ; + lv2:name "Record Options" ; + lv2:symbol "options_group" . + +myprefix:output_group + a pg:ControlGroup ; + lv2:name "Output" ; + lv2:symbol "output_group" . + + + + + a foaf:Person ; + foaf:name "Robin Davies" ; + foaf:mbox ; + foaf:homepage . + + + + a lv2:Plugin , + lv2:UtilityPlugin ; + doap:name "TooB One-Button Looper (stereo)" + ; + + + doap:license ; + doap:maintainer ; + lv2:minorVersion 1 ; + lv2:microVersion 58 ; + + ui:ui ; + + + lv2:extensionData state:interface ; + + rdfs:comment """ +## TooB One-Button Looper. + +TooB One-Button Looper is designed to be controlled by a single MIDI foot controller. If you will be controlling your looper from a screen user-interface, use Toob 4Looper instead. + +### Basic Operation + +To use the One-Button Looper with PiPedal, bind a MIDI foot switch to the control port using the PiPedal MIDI Bindings user-interface. It's easiest to configure +the MIDI foot controller to send Note-On/Note-Off midi messages, since the control values that a MIDI foot controller sends may not be consistent with what the +One-Button Looper expects. However, if you must use a MIDI foot controller that sends Control Change messages, then you must configure the MIDI foot controller +to send a CC value of zero when not pressed, and a non-zero value when pressed. + + +Loop overdubs are stored in a stack, so that they can be erased one at a time. To erase the most recent overdub, and return to the previous state of the loop, +long-press the MIDI controller (or the Control button if you are using the PiPedal user interface). A long-press is a press of at least 1/2 second, but +less than two seconds. The current loop will be undone when you release the control. To stop looping altogether, press the MIDI foot controller (or the Control button) for at least two seconds. The looper will stop when you +release the control. + +### Clock Options + +Clock options determine the tempo and number of beats in a bar. They affect the behavior of the looper when the Bars control (see below) is set to +a numeric value, and also affect the rate of the flashing LEDs when counting in. + +### Record Options + +Record Options control the behavior of the looper. + +When Count In is enabled, The looper will Count In before starting the main loop. The Record LED will flash when counting in, and go solid +once recording starts. The pattern of blinking lights depends on the TimeSig setting, so for example, if the Time Signature is set to 4/4, the +blinking LED will signal a count-in pattern of "1 - 2 - 1 2 3 4". + +When Bars is set to Free (the minimum value), the length of the main loop will be set by the second tap of the +Control button after recording of the main loop starts. If Bars is set to a numeric value, the length of the main loop will be determined by the number +of bars set in the Bars control, and the current settings of the Clock controls. + +If Dub Sync is off, overdubs will start recording as soon as you tap the Control button. If enabled, the start +of the secondary loop will sync with main loop. Tapping the Control button will put the looper in "Cue Overdub" state +and the LEDs will flash until the end of the main loop is reached, at which point the new loop will start recording. + +The Loop End option only has effect when the Bars control is set to a numeric value, and does nothing if Bars is set to "Free". +When set to REC-PLAY, the main loop will record exactly N bars of audio, and switch to play mode when the end of the loop is reached. +When set to REC-DUB, the main loop will record exactly N bars of audio, and then continue on in overdub mode. + +### Looper State Table + +``` ++-----------+--------------+----------------------------------+ +| State | Action | Effect | +|-----------|--------------|----------------------------------| +| Empty | Tap | Start counting in if COUNT IN is | +| | | enabled; otherwise start | +| | | recording immediately. | +|-----------|--------------|----------------------------------| +| Count-In | Tap/ | Return to empty state | +| | Long-press | | +| | | | +| | Complete | Start recording | +|-----------|--------------|----------------------------------| +| Recording | Tap | Set the loop length and go to | +| | | play state. | +| | | | +| | Long-press | Discard the current loop and | +| | | return to Empty state | +| | | | +| | End of loop | go to play or overdub state | +| | | depending on ON REC END | +|-----------|--------------|----------------------------------| +| Playing | Tap | If DUB SYNC is on, go to | +| | | Cue Ovdb state; otherwise | +| | | start overdubbing immediately. | +| | | | +| | Long-press | Undo the most recent | +| | | overdub and go to play | +| | | state. | +|-----------|--------------|----------------------------------| +| Cue Ovdb | End-of-loop | Start overdubbing. | +| | | | +| | Tap | Cancel the pending overdub. | +| | | | +| | Long-press | Cancel the pending overdub. | +|-----------|--------------|----------------------------------| +| Overdub | Tap | Start playing. | +| | | | +| | End of loop | (If DUB SYNC is on, and | +| | | REC->PLAY is selected) Go to | +| | | play state, otherwise, continue | +| | | in overdub state. | ++-----------|--------------|----------------------------------+ +``` + +""" ; + + mod:brand "TooB"; + mod:label "One-Looper"; + lv2:optionalFeature lv2:hardRTCapable; + + lv2:port + ################# MAIN Loop + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 0; + lv2:symbol "control" ; + lv2:name "〇"; + rdfs:comment "Looper control. See the plugin documentation for details."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:integer, lv2:toggled, mod:preferMomentaryOffByDefault; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 1; + lv2:symbol "record_led" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 2 ; + lv2:symbol "play_led" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pg:group myprefix:loop_main_group ; + pipedal_ui:ledColor "green"; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 3; + lv2:symbol "position" ; + rdfs:comment "Loop position"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + units:unit units:pc ; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 1.0 ; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 4; + lv2:symbol "loop_level" ; + rdfs:comment "Loop Level"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 21.0 ; + pg:group myprefix:loop_main_group ; + lv2:portProperty lv2:enumeration ; + + lv2:scalePoint [ + rdfs:label "-" ; + rdf:value 0.0 + ] , + [ + rdfs:label "1" ; + rdf:value 1.0 + ], + [ + rdfs:label "2" ; + rdf:value 2.0 + ], + [ + rdfs:label "3" ; + rdf:value 3.0 + ], + [ + rdfs:label "4" ; + rdf:value 4.0 + ], + [ + rdfs:label "5" ; + rdf:value 5.0 + ], + [ + rdfs:label "6" ; + rdf:value 6.0 + ], + [ + rdfs:label "7" ; + rdf:value 7.0 + ], + [ + rdfs:label "8" ; + rdf:value 8.0 + ], + [ + rdfs:label "9" ; + rdf:value 9.0 + ], + [ + rdfs:label "10" ; + rdf:value 10.0 + ], + [ + rdfs:label "11" ; + rdf:value 11.0 + ], + [ + rdfs:label "12" ; + rdf:value 12.0 + ], + [ + rdfs:label "13" ; + rdf:value 13.0 + ], + [ + rdfs:label "14" ; + rdf:value 14.0 + ], + [ + rdfs:label "15" ; + rdf:value 15.0 + ], + [ + rdfs:label "16" ; + rdf:value 16.0 + ], + [ + rdfs:label "17" ; + rdf:value 17.0 + ], + [ + rdfs:label "18" ; + rdf:value 18.0 + ], + [ + rdfs:label "19" ; + rdf:value 19.0 + ], + [ + rdfs:label "20" ; + rdf:value 20.0 + ], + [ + rdfs:label "+" ; + rdf:value 21.0 + ] + ; + + ], + + + ###### Sync + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 5; + lv2:symbol "bar_led" ; + lv2:name "\u00A0\u00A0Bar\u00A0\u00A0"; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:syncGroup ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 6; + lv2:symbol "beat_led" ; + lv2:name "\u00A0Beat\u00A0"; + lv2:portProperty lv2:toggled ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:syncGroup ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 7; + lv2:symbol "tempo" ; + lv2:name "Tempo"; + lv2:default 120.0 ; + lv2:minimum 40.0; + lv2:maximum 240.0; + units:unit units:bpm; + rdfs:comment "Tempo in quarter-notes per minute" + ; pg:group myprefix:syncGroup + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 8; + lv2:symbol "timesig" ; + rdfs:comment "Time Signature"; + lv2:name "TimeSig"; + lv2:default 2 ; + lv2:minimum 0; + lv2:maximum 5; + lv2:portProperty lv2:enumeration ; + + lv2:scalePoint [ + rdfs:label "2/2" ; + rdf:value 0 + ] , [ + rdfs:label "3/4" ; + rdf:value 1 + ] , [ + rdfs:label "4/4" ; + rdf:value 2 + ] , + [ + rdfs:label "5/4" ; + rdf:value 3 + ] , + [ + rdfs:label "6/8" ; + rdf:value 4 + ] , + [ + rdfs:label "7/4" ; + rdf:value 5 + ]; + pg:group myprefix:syncGroup + ], + + ########## Options + + [ + lv2:name "Count In" ; + + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 9; + lv2:symbol "rec_count_in" ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled; + rdfs:comment "Whether to count in when starting the main loop."; + + pg:group myprefix:options_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 10; + lv2:symbol "bars" ; + lv2:name "Bars"; + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 32.0 ; + units:unit units:bar ; + lv2:portProperty lv2:integer; + rdfs:comment "Loop length in bars. Set to minimum for arbitrary length loops."; + pg:group myprefix:options_group ; + lv2:scalePoint [ + rdfs:label "Free" ; + rdf:value 0.0 ; + ] ; + ], + [ + lv2:name "Dub Sync" ; + + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 11; + lv2:symbol "rec_sync_option" ; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled; + rdfs:comment "Whether to sync the start of the loop with the main loop when recording secondary loops."; + + pg:group myprefix:options_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 12; + lv2:symbol "loop_end_option" ; + lv2:name "On Rec End"; + lv2:default 1.0 ; + lv2:minimum 1.0; + lv2:maximum 2.0; + lv2:portProperty lv2:enumeration; + rdfs:comment "Whether to go to OVERDUB or PLAY state a loop ends."; + + lv2:scalePoint [ + rdfs:label "REC->PLAY" ; + rdf:value 1.0 + ] , [ + rdfs:label "REC->DUB" ; + rdf:value 2.0 + ] ; + + pg:group myprefix:options_group ; + ], + + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 13; + lv2:symbol "level" ; + lv2:name "Level"; + lv2:name "Level"; + pg:group myprefix:output_group ; + + lv2:default 0.0 ; + lv2:minimum -60.0; + lv2:maximum 30.0; + lv2:scalePoint [ + rdfs:label "-INF" ; + rdf:value -60.0 + ]; + units:unit units:db + ], + + ################# Audio/Control Busses + + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 14 ; + lv2:symbol "in" ; + lv2:name "In"; + pg:group myprefix:stereoInGroup ; + lv2:designation pg:left + + ], + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 15 ; + lv2:symbol "out" ; + lv2:name "Out" ; + pg:group myprefix:stereoOutGroup ; + lv2:designation pg:left + ], + + [ + a atom:AtomPort , + lv2:InputPort ; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + + lv2:index 16 ; + lv2:symbol "controlIn" ; + lv2:name "ControlIn" + ], + [ + a atom:AtomPort , + lv2:OutputPort ; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + lv2:index 17 ; + lv2:symbol "controlOut" ; + lv2:name "ControlOut" + ], + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 18; + lv2:symbol "inR" ; + lv2:name "InR" ; + pg:group myprefix:stereoInGroup ; + lv2:designation pg:right + + ], + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 19 ; + lv2:symbol "outR" ; + lv2:name "OutR" ; + pg:group myprefix:stereoOutGroup ; + lv2:designation pg:right + ] + + + ; + + . + + + + + a ui:X11UI ; + lv2:binary ; + + + lv2:extensionData ui:resize ; + lv2:extensionData ui:idleInterface ; + lv2:requiredFeature ui:idleInterface ; +. + diff --git a/lv2/aarch64/ToobAmp.lv2/ToobLooperStereo.ttl b/lv2/aarch64/ToobAmp.lv2/ToobLooperStereo.ttl new file mode 100644 index 0000000..d290636 --- /dev/null +++ b/lv2/aarch64/ToobAmp.lv2/ToobLooperStereo.ttl @@ -0,0 +1,726 @@ +@prefix doap: . +@prefix lv2: . +@prefix rdfs: . +@prefix rdf: . +@prefix units: . +@prefix urid: . +@prefix atom: . +@prefix midi: . +@prefix epp: . +@prefix uiext: . +@prefix idpy: . +@prefix foaf: . +@prefix mod: . +@prefix param: . +@prefix work: . +@prefix pg: . +@prefix atom: . +@prefix patch: . +@prefix state: . +@prefix urid: . +@prefix xsd: . +@prefix ui: . +@prefix pprop: . +@prefix pipedal_ui: . + + +@prefix looperPrefix: . + +@prefix myprefix: . + + +myprefix:stereoInGroup + a pg:StereoGroup, pg:InputGroup ; + rdfs:label "Stereo Input" ; + lv2:symbol "in_g" . + +myprefix:steroOutGroup a pg:Group ; + a pg:StereoGroup, pg:OuputGroup ; + rdfs:label "Stereo Output" ; + lv2:symbol "out_g" . + + +myprefix:syncGroup + a pg:ControlGroup ; + lv2:name "Clock" ; + lv2:symbol "sync_g" . + + +myprefix:loop_main_group + a pg:ControlGroup ; + lv2:name "Main Loop" ; + lv2:symbol "loop_main_group" . + +myprefix:loop2_group + a pg:ControlGroup ; + lv2:name "Loop 2" ; + lv2:symbol "loop2_group" . + +myprefix:loop3_group + a pg:ControlGroup ; + lv2:name "Loop 3" ; + lv2:symbol "loop3_group" . + +myprefix:loop4_group + a pg:ControlGroup ; + lv2:name "Loop 4" ; + lv2:symbol "loop4_group" . + +myprefix:options_group + a pg:ControlGroup ; + lv2:name "Options" ; + lv2:symbol "options_group" . + +myprefix:output_group + a pg:ControlGroup ; + lv2:name "Output" ; + lv2:symbol "output_group" . + + + + + a foaf:Person ; + foaf:name "Robin Davies" ; + foaf:mbox ; + foaf:homepage . + + + + a lv2:Plugin , + lv2:UtilityPlugin ; + doap:name "TooB 4Looper (stereo)" + ; + doap:license ; + doap:maintainer ; + lv2:minorVersion 1 ; + lv2:microVersion 57 ; + + ui:ui ; + + patch:readable + looperPrefix:audioFile; + patch:writable + looperPrefix:audioFile; + + lv2:extensionData state:interface ; + + rdfs:comment """ +A Stereo Looper. + +- A single tap on the bound midi controller will start recording. +- A second tap with mark the end of the loop, and start playback. +- Subsequent taps will toggle overdub mode. When overdubbing, new audio input will be blended with the existing loop. +- A touble tap will stop playback. +- To erase an overdub, long press the MIDI controller. The loop will return to the state that it was in before the overdub was made. + + + +""" ; + + mod:brand "TooB"; + mod:label "4Looper"; + lv2:optionalFeature lv2:hardRTCapable; + + lv2:port + ################# MAIN Loop + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 0; + lv2:symbol "stop1" ; + lv2:name "⏹"; + rdfs:comment "Reset loop 1."; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 1; + lv2:symbol "record1" ; + lv2:name "⏺"; + rdfs:comment "Record/Overdub loop 1"; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 2; + lv2:symbol "record_led1" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 3; + lv2:symbol "play1" ; + lv2:name "⏵"; + rdfs:comment "Play Loop 1. Click again to stop."; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 4; + lv2:symbol "play_led1" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + pg:group myprefix:loop_main_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 5; + lv2:symbol "position1" ; + rdfs:comment "Time"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + units:unit units:pc ; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 100.0 ; + pg:group myprefix:loop_main_group ; + ], + + + ################# Loop2 + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 6; + lv2:symbol "stop2" ; + lv2:name "⏹"; + rdfs:comment "Reset loop 2."; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 7; + lv2:symbol "record2" ; + lv2:name "⏺"; + rdfs:comment "Record/Overdub loop 2"; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 8; + lv2:symbol "record_led2" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 9; + lv2:symbol "play2" ; + lv2:name "⏵"; + rdfs:comment "Play Loop 2. Click again to stop."; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 10; + lv2:symbol "play_led2" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + pg:group myprefix:loop2_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 11; + lv2:symbol "position2" ; + rdfs:comment "Time"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + units:unit units:pc ; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 100.0 ; + pg:group myprefix:loop2_group ; + ], + + ################# Loop3 + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 12; + lv2:symbol "stop3" ; + lv2:name "⏹"; + rdfs:comment "Reset loop 3."; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 13; + lv2:symbol "record3" ; + lv2:name "⏺"; + rdfs:comment "Record/Overdub loop 3"; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 14; + lv2:symbol "record_led3" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 15; + lv2:symbol "play3" ; + lv2:name "⏵"; + rdfs:comment "Play Loop 3. Click again to stop."; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 16; + lv2:symbol "play_led3" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + pg:group myprefix:loop3_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 17; + lv2:symbol "position3" ; + rdfs:comment "Time"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + units:unit units:pc ; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 100.0 ; + pg:group myprefix:loop3_group ; + ], + + + ################# Loop4 + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 18; + lv2:symbol "stop4" ; + lv2:name "⏹"; + rdfs:comment "Reset loop 4."; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 19; + lv2:symbol "record4" ; + lv2:name "⏺"; + rdfs:comment "Record/Overdub loop 4"; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 20; + lv2:symbol "record_led4" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 21; + lv2:symbol "play4" ; + lv2:name "⏵"; + rdfs:comment "Play Loop 4. Click again to stop."; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 22; + lv2:symbol "play_led4" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + pg:group myprefix:loop4_group ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 23; + lv2:symbol "position4" ; + rdfs:comment "Time"; + lv2:name "\u00A0\u00A0\u00A0\u00A0"; + units:unit units:pc ; + + lv2:default 0.0 ; + lv2:minimum 0.0 ; + lv2:maximum 100.0 ; + pg:group myprefix:loop4_group ; + ], + + + ###### Sync + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 24; + lv2:symbol "bar_led" ; + lv2:name "\u00A0\u00A0Bar\u00A0\u00A0"; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:syncGroup ; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 25; + lv2:symbol "beat_led" ; + lv2:name "\u00A0Beat\u00A0"; + lv2:portProperty lv2:toggled ; + lv2:default 0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + pg:group myprefix:syncGroup ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 26; + lv2:symbol "tempo" ; + lv2:name "Tempo"; + lv2:default 120.0 ; + lv2:minimum 40.0; + lv2:maximum 240.0; + units:unit units:bpm; + rdfs:comment "Tempo in quarter-notes per minute" + ; pg:group myprefix:syncGroup + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 27; + lv2:symbol "timesig" ; + rdfs:comment "Time Signature"; + lv2:name "TimeSig"; + lv2:default 2 ; + lv2:minimum 0; + lv2:maximum 5; + lv2:portProperty lv2:enumeration ; + + lv2:scalePoint [ + rdfs:label "2/2" ; + rdf:value 0 + ] , [ + rdfs:label "3/4" ; + rdf:value 1 + ] , [ + rdfs:label "4/4" ; + rdf:value 2 + ] , + [ + rdfs:label "5/4" ; + rdf:value 3 + ] , + [ + rdfs:label "6/8" ; + rdf:value 4 + ] , + [ + rdfs:label "7/4" ; + rdf:value 5 + ]; + pg:group myprefix:syncGroup + ], + + ########## Options + + [ + lv2:name "Count In" ; + + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 28; + lv2:symbol "rec_count_in" ; + lv2:default 1.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled; + rdfs:comment "Whether to count in when starting the main loop."; + + pg:group myprefix:options_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 29; + lv2:symbol "bars" ; + lv2:name "Bars"; + lv2:default 0 ; + lv2:minimum 0; + lv2:maximum 32; + units:unit units:bar ; + lv2:portProperty lv2:integer; + rdfs:comment "Loop length in bars. Set to minimum for arbitrary length loops."; + pg:group myprefix:options_group ; + lv2:scalePoint [ + rdfs:label "Free" ; + rdf:value 0.0 + ] + ], + [ + lv2:name "Rec Sync" ; + + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 30; + lv2:symbol "rec_sync_option" ; + lv2:default 1.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled; + rdfs:comment "Whether to sync the start of the loop with the main loop when recording secondary loops."; + + pg:group myprefix:options_group ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 31; + lv2:symbol "loop_end_option" ; + lv2:name "On Rec End"; + lv2:default 1.0 ; + lv2:minimum 1.0; + lv2:maximum 2.0; + lv2:portProperty lv2:enumeration; + rdfs:comment "(One-control MIDI operation only) Whether to go to OVERDUB or PLAY state when recording of the main loop ends."; + + lv2:scalePoint [ + rdfs:label "REC->PLAY" ; + rdf:value 1.0 + ] , [ + rdfs:label "REC->DUB" ; + rdf:value 2.0 + ] ; + + pg:group myprefix:options_group ; + ], + + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 32; + lv2:symbol "level" ; + lv2:name "Level"; + lv2:name "Level"; + pg:group myprefix:output_group ; + + lv2:default 0 ; + lv2:minimum -60.0; + lv2:maximum 30.0; + lv2:scalePoint [ + rdfs:label "-INF" ; + rdf:value -60.0 + ]; + units:unit units:db + ], + + ################# Audio/Control Busses + + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 33 ; + lv2:symbol "in" ; + lv2:name "In"; + pg:group myprefix:stereoInGroup ; + lv2:designation pg:left + + ], + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 34 ; + lv2:symbol "out" ; + lv2:name "Out" ; + pg:group myprefix:stereoOutGroup ; + lv2:designation pg:left + ], + + [ + a atom:AtomPort , + lv2:InputPort ; + lv2:index 35 ; + lv2:symbol "controlIn" ; + lv2:name "ControlIn" + ], + [ + a atom:AtomPort , + lv2:OutputPort ; + lv2:index 36 ; + lv2:symbol "controlOut" ; + lv2:name "ControlOut" + ], + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 37; + lv2:symbol "inR" ; + lv2:name "InR" ; + pg:group myprefix:stereoInGroup ; + lv2:designation pg:right + + ], + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 38 ; + lv2:symbol "outR" ; + lv2:name "OutR" ; + pg:group myprefix:stereoOutGroup ; + lv2:designation pg:right + ] + + + ; + + . + + + + + a ui:X11UI ; + lv2:binary <.so>; + + lv2:extensionData ui:resize ; + lv2:extensionData ui:idleInterface ; + lv2:requiredFeature ui:idleInterface ; +. + + diff --git a/lv2/aarch64/ToobAmp.lv2/ToobML.ttl b/lv2/aarch64/ToobAmp.lv2/ToobML.ttl index 25dce24..08a7d62 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobML.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobML.ttl @@ -15,6 +15,8 @@ @prefix work: . @prefix pg: . @prefix pipedal_ui: . +@prefix pipedal_patch: . + @prefix toob: . @prefix atom: . @@ -65,7 +67,7 @@ toobml:sagGroup doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; 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. @@ -127,7 +129,7 @@ and uses model files from the GuitarML Neural Pi project (https://github.com/Gui patch:writable toobml:modelFile; - patch:readable + pipedal_patch:readable ; diff --git a/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl b/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl index 57c7b2b..a015dc9 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobNeuralAmpModeler.ttl @@ -61,7 +61,7 @@ toobNam:eqGroup doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; rdfs:comment """ A port of Steven Atkinson's Neural Amp Modeler to LV2. diff --git a/lv2/aarch64/ToobAmp.lv2/ToobRecordMono.ttl b/lv2/aarch64/ToobAmp.lv2/ToobRecordMono.ttl new file mode 100644 index 0000000..2560393 --- /dev/null +++ b/lv2/aarch64/ToobAmp.lv2/ToobRecordMono.ttl @@ -0,0 +1,266 @@ +@prefix doap: . +@prefix lv2: . +@prefix rdf: . +@prefix rdfs: . +@prefix units: . +@prefix urid: . +@prefix atom: . +@prefix midi: . +@prefix epp: . +@prefix uiext: . +@prefix idpy: . +@prefix foaf: . +@prefix mod: . +@prefix param: . +@prefix work: . +@prefix pg: . +@prefix atom: . +@prefix patch: . +@prefix rdfs: . +@prefix state: . +@prefix urid: . +@prefix xsd: . +@prefix ui: . +@prefix pprop: . +@prefix pipedal_ui: . + + +@prefix recordPrefix: . + +@prefix myprefix: . + + + + a foaf:Person ; + foaf:name "Robin Davies" ; + foaf:mbox ; + foaf:homepage . + +recordPrefix:audioFile + a lv2:Parameter; + rdfs:label "File"; + mod:fileTypes "audiorecording,audio"; + rdfs:range atom:Path; + lv2:index 6 + . + + + a lv2:Plugin , + lv2:UtilityPlugin ; + doap:name "TooB Record Input (mono)" + ; + doap:license ; + doap:maintainer ; + lv2:minorVersion 1 ; + lv2:microVersion 58 ; + + ui:ui ; + + patch:readable + recordPrefix:audioFile; + patch:writable + recordPrefix:audioFile; + + lv2:extensionData state:interface ; + + rdfs:comment """ +Record the plugin's audio input signal to a monophonic file. See also: TooB Record Input (stereo), which records a stereo file. +""" ; + + mod:brand "TooB"; + mod:label "Record Input"; + lv2:optionalFeature lv2:hardRTCapable; + + lv2:port + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 0; + lv2:symbol "stop" ; + lv2:name "⏹"; + rdfs:comment "Stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 1; + lv2:symbol "record" ; + lv2:name "⏺"; + rdfs:comment "Start recording. Click again to stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 2; + lv2:symbol "record_led" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 3; + lv2:symbol "play" ; + lv2:name "⏵"; + rdfs:comment "Preview recorded file. Click again to stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 4; + lv2:symbol "play_led" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 5; + lv2:symbol "record_time" ; + rdfs:comment "Time"; + lv2:name ""; + units:unit units:s ; + + lv2:minimum 0.0; + lv2:maximum 1000000.0; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 6; + lv2:symbol "fformat" ; + lv2:name "Format"; + rdfs:comment "Recording File Format"; + + lv2:portProperty lv2:integer, lv2:enumeration ; + + lv2:default 0.0 ; + lv2:minimum 0 ; + lv2:maximum 3 ; + lv2:scalePoint [ + rdfs:label "WAV" ; + rdf:value 0 + ], + [ + rdfs:label "WAV (float32)" ; + rdf:value 1 + ], + [ + rdfs:label "FLAC" ; + rdf:value 2; + ], + [ + rdfs:label "MP3" ; + rdf:value 3 + ] + ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 7; + lv2:symbol "level" ; + lv2:name "Level"; + rdfs:comment "Input trim level for recording"; + lv2:default 0.0 ; + lv2:minimum -60.0; + lv2:maximum 30.0; + lv2:scalePoint [ + rdfs:label "-INF" ; + rdf:value -60.0 + ]; + units:unit units:db + + ], + + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 8 ; + lv2:symbol "level_vu" ; + lv2:name ""; + rdfs:comment "Recording level"; + + lv2:default -60 ; + lv2:minimum -60 ; + lv2:maximum 20 ; + units:unit units:db + ], + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 9 ; + lv2:symbol "in" ; + lv2:name "In" + ], + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 10 ; + lv2:symbol "out" ; + lv2:name "Out" + ], + + [ + a atom:AtomPort , + lv2:InputPort ; + lv2:index 11 ; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + lv2:designation lv2:control ; + lv2:symbol "controlIn" ; + lv2:name "ControlIn" + ], + [ + a atom:AtomPort , + lv2:OutputPort ; + lv2:index 12 ; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + lv2:designation lv2:control ; + + lv2:symbol "controlOut" ; + lv2:name "ControlOut" + ] + . + + + a ui:X11UI ; + lv2:binary ; + lv2:extensionData ui:resize ; + lv2:extensionData ui:idleInterface ; + lv2:requiredFeature ui:idleInterface ; + ui:portNotification [ + ui:plugin ; + lv2:symbol "controlOut" ; + ]; +. + + diff --git a/lv2/aarch64/ToobAmp.lv2/ToobRecordStereo.ttl b/lv2/aarch64/ToobAmp.lv2/ToobRecordStereo.ttl new file mode 100644 index 0000000..1ef7ef3 --- /dev/null +++ b/lv2/aarch64/ToobAmp.lv2/ToobRecordStereo.ttl @@ -0,0 +1,325 @@ +@prefix doap: . +@prefix lv2: . +@prefix rdf: . +@prefix rdfs: . +@prefix units: . +@prefix urid: . +@prefix atom: . +@prefix midi: . +@prefix epp: . +@prefix uiext: . +@prefix idpy: . +@prefix foaf: . +@prefix mod: . +@prefix param: . +@prefix work: . +@prefix pg: . +@prefix atom: . +@prefix patch: . +@prefix rdfs: . +@prefix state: . +@prefix urid: . +@prefix xsd: . +@prefix ui: . +@prefix pprop: . +@prefix pipedal_ui: . + +@prefix recordPrefix: . +@prefix myprefix: . + + + + a foaf:Person ; + foaf:name "Robin Davies" ; + foaf:mbox ; + foaf:homepage . + +recordPrefix:audioFile + a lv2:Parameter; + rdfs:label "File"; + mod:fileTypes "audiorecording,audio"; + rdfs:range atom:Path; + lv2:index 6 + . + +myprefix:stereoInGroup + a pg:StereoGroup, pg:InputGroup ; + rdfs:label "Stereo Input" ; + lv2:symbol "in_g" . + +myprefix:steroOutGroup a pg:Group ; + a pg:StereoGroup, pg:OuputGroup ; + rdfs:label "Stereo Output" ; + lv2:symbol "out_g" . + + +myprefix:loop0_group + a param:ControlGroup , + pg:InputGroup ; + lv2:name "Master" ; + lv2:symbol "loop0_group" . + +myprefix:loop1_group + a param:ControlGroup , + pg:InputGroup ; + lv2:name "1" ; + lv2:symbol "loop1_group" . + +myprefix:loop2_group + a param:ControlGroup , + pg:InputGroup ; + lv2:name "2" ; + lv2:symbol "loop2_group" . + +myprefix:loop3_group + a param:ControlGroup , + pg:InputGroup ; + lv2:name "3" ; + lv2:symbol "loop3_group" . + + + + + + a lv2:Plugin , + lv2:UtilityPlugin ; + doap:name "TooB Record Input (stereo)" + ; + doap:license ; + doap:maintainer ; + lv2:minorVersion 1 ; + lv2:microVersion 58 ; + + ui:ui ; + + patch:readable + recordPrefix:audioFile; + patch:writable + recordPrefix:audioFile; + + lv2:extensionData state:interface ; + + + rdfs:comment """ +Record the plugin's audio input signal to a stereophonic file. See also: TooB Record Input (mono), which records a monophonic file. +""" ; + + mod:brand "TooB"; + mod:label "Record Input"; + lv2:optionalFeature lv2:hardRTCapable; + + lv2:port + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 0; + lv2:symbol "stop" ; + lv2:name "⏹"; + rdfs:comment "Stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 1; + lv2:symbol "record" ; + lv2:name "⏺"; + rdfs:comment "Start recording. Click again to stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 2; + lv2:symbol "record_led" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "red"; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 3; + lv2:symbol "play" ; + lv2:name "⏵"; + rdfs:comment "Preview the recorded file. Click again to stop."; + lv2:default 0.0 ; + lv2:minimum 0.0; + lv2:maximum 1.0; + lv2:portProperty lv2:toggled,pprop:trigger; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 4; + lv2:symbol "play_led" ; + lv2:name ""; + lv2:portProperty lv2:toggled ; + lv2:minimum 0.0; + lv2:maximum 1.0; + pipedal_ui:ledColor "green"; + ], + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 5; + lv2:symbol "record_time" ; + rdfs:comment "Time"; + lv2:name ""; + units:unit units:s ; + + lv2:minimum 0.0; + lv2:maximum 1000000.0; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 6; + lv2:symbol "fformat" ; + lv2:name "Format"; + rdfs:comment "Recording File Format"; + + lv2:portProperty lv2:integer, lv2:enumeration ; + + lv2:default 0.0 ; + lv2:minimum 0 ; + lv2:maximum 3 ; + lv2:scalePoint [ + rdfs:label "WAV" ; + rdf:value 0 + ], + [ + rdfs:label "WAV (float32)" ; + rdf:value 1 + ], + [ + rdfs:label "FLAC" ; + rdf:value 2; + ], + [ + rdfs:label "MP3" ; + rdf:value 3 + ] + ; + ], + [ + a lv2:InputPort , + lv2:ControlPort ; + + lv2:index 7; + lv2:symbol "level" ; + lv2:name "Level"; + lv2:name "Input trim level for recording"; + lv2:default 0.0 ; + lv2:minimum -60.0; + lv2:maximum 30.0; + lv2:scalePoint [ + rdfs:label "-INF" ; + rdf:value -60.0 + ]; + units:unit units:db + + + + ], + + [ + a lv2:OutputPort , + lv2:ControlPort ; + + lv2:index 8 ; + lv2:symbol "level_vu" ; + lv2:name ""; + rdfs:comment "Recording level"; + + lv2:default -60 ; + lv2:minimum -60 ; + lv2:maximum 20 ; + units:unit units:db + ], + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 9 ; + lv2:symbol "in" ; + lv2:name "In"; + pg:group myprefix:stereoInGroup ; + lv2:designation pg:left + + ], + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 10 ; + lv2:symbol "out" ; + lv2:name "Out"; + pg:group myprefix:stereoOutGroup ; + lv2:designation pg:left + ], + + [ + a atom:AtomPort , + lv2:InputPort ; + lv2:index 11 ; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + + lv2:symbol "controlIn" ; + lv2:name "ControlIn" + ], + [ + a atom:AtomPort , + lv2:OutputPort ; + lv2:index 12 ; + atom:bufferType atom:Sequence ; + atom:supports patch:Message; + + lv2:symbol "controlOut" ; + lv2:name "ControlOut" + ], + [ + a lv2:AudioPort , + lv2:InputPort ; + lv2:index 13 ; + lv2:symbol "inR" ; + lv2:name "InR" ; + pg:group myprefix:stereoInGroup ; + lv2:designation pg:right + ], + [ + a lv2:AudioPort , + lv2:OutputPort ; + lv2:index 14 ; + lv2:symbol "outR" ; + lv2:name "OutR" ; + pg:group myprefix:stereoOutGroup ; + lv2:designation pg:right + + ] + . + + + + a ui:X11UI ; + lv2:binary ; + lv2:extensionData ui:resize ; + lv2:extensionData ui:idleInterface ; + lv2:requiredFeature ui:idleInterface ; +. + + diff --git a/lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl b/lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl index 3f47c08..1f8cc18 100644 --- a/lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl +++ b/lv2/aarch64/ToobAmp.lv2/ToobTuner.ttl @@ -40,7 +40,7 @@ doap:license ; doap:maintainer ; lv2:minorVersion 0 ; - lv2:microVersion 57 ; + lv2:microVersion 58 ; rdfs:comment """ TooB Tuner is a chromatic guitar tuner. """ ; diff --git a/lv2/aarch64/ToobAmp.lv2/manifest.ttl b/lv2/aarch64/ToobAmp.lv2/manifest.ttl index 63afba4..16a8335 100644 --- a/lv2/aarch64/ToobAmp.lv2/manifest.ttl +++ b/lv2/aarch64/ToobAmp.lv2/manifest.ttl @@ -71,6 +71,25 @@ lv2:binary ; rdfs:seeAlso . + a lv2:Plugin ; + lv2:binary ; + rdfs:seeAlso . + + + a lv2:Plugin ; + lv2:binary ; + rdfs:seeAlso . + + a lv2:Plugin ; + lv2:binary ; + rdfs:seeAlso . + + a lv2:Plugin ; + lv2:binary ; + rdfs:seeAlso . + + + tpset:toob-flanger-preset-0 a pset:Preset ; diff --git a/lv2/aarch64/ToobAmp.lv2/resources/LooperFourLogo.svg b/lv2/aarch64/ToobAmp.lv2/resources/LooperFourLogo.svg new file mode 100644 index 0000000..f644803 --- /dev/null +++ b/lv2/aarch64/ToobAmp.lv2/resources/LooperFourLogo.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lv2/aarch64/ToobAmp.lv2/resources/LooperOneLogo.svg b/lv2/aarch64/ToobAmp.lv2/resources/LooperOneLogo.svg new file mode 100644 index 0000000..d9069ed --- /dev/null +++ b/lv2/aarch64/ToobAmp.lv2/resources/LooperOneLogo.svg @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lv2/aarch64/ToobAmp.lv2/resources/ToobRecordMono.svg b/lv2/aarch64/ToobAmp.lv2/resources/ToobRecordMono.svg new file mode 100644 index 0000000..5088a8d --- /dev/null +++ b/lv2/aarch64/ToobAmp.lv2/resources/ToobRecordMono.svg @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lv2/aarch64/ToobAmp.lv2/resources/ToobRecordStereo.svg b/lv2/aarch64/ToobAmp.lv2/resources/ToobRecordStereo.svg new file mode 100644 index 0000000..d07f5c5 --- /dev/null +++ b/lv2/aarch64/ToobAmp.lv2/resources/ToobRecordStereo.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lv2/aarch64/ToobAmp.lv2/resources/green_led.png b/lv2/aarch64/ToobAmp.lv2/resources/green_led.png new file mode 100644 index 0000000..09be4e0 Binary files /dev/null and b/lv2/aarch64/ToobAmp.lv2/resources/green_led.png differ diff --git a/lv2/aarch64/ToobAmp.lv2/resources/red_led.png b/lv2/aarch64/ToobAmp.lv2/resources/red_led.png new file mode 100644 index 0000000..a472515 Binary files /dev/null and b/lv2/aarch64/ToobAmp.lv2/resources/red_led.png differ diff --git a/lv2/aarch64/ToobAmp.lv2/resources/white_led.png b/lv2/aarch64/ToobAmp.lv2/resources/white_led.png new file mode 100644 index 0000000..2fdd22d Binary files /dev/null and b/lv2/aarch64/ToobAmp.lv2/resources/white_led.png differ diff --git a/lv2/x86_64/toobamp_1.1.57_amd64.deb b/lv2/x86_64/toobamp_1.1.57_amd64.deb deleted file mode 100644 index d025ecf..0000000 Binary files a/lv2/x86_64/toobamp_1.1.57_amd64.deb and /dev/null differ diff --git a/lv2/x86_64/toobamp_1.1.58_amd64.deb b/lv2/x86_64/toobamp_1.1.58_amd64.deb new file mode 100644 index 0000000..28f6957 Binary files /dev/null and b/lv2/x86_64/toobamp_1.1.58_amd64.deb differ diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp index 9b14d64..bcc4eab 100644 --- a/src/AlsaDriver.cpp +++ b/src/AlsaDriver.cpp @@ -720,7 +720,7 @@ namespace pipedal std::vector &buffers = this->captureBuffers; int channels = this->captureChannels; - constexpr float scale = 1.0f / (std::numeric_limits::max() + 1L); + constexpr double scale = 1.0f / (std::numeric_limits::max() + 1L); for (size_t frame = 0; frame < frames; ++frame) { for (int channel = 0; channel < channels; ++channel) @@ -891,7 +891,7 @@ namespace pipedal std::vector &buffers = this->playbackBuffers; int channels = this->playbackChannels; - constexpr float scale = std::numeric_limits::max(); + constexpr double scale = std::numeric_limits::max(); for (size_t frame = 0; frame < frames; ++frame) { for (int channel = 0; channel < channels; ++channel) @@ -913,7 +913,7 @@ namespace pipedal std::vector &buffers = this->playbackBuffers; int channels = this->playbackChannels; - constexpr float scale = 0x00FFFFFF; + constexpr double scale = 0x00FFFFFF; for (size_t frame = 0; frame < frames; ++frame) { for (int channel = 0; channel < channels; ++channel) @@ -935,7 +935,7 @@ namespace pipedal std::vector &buffers = this->playbackBuffers; int channels = this->playbackChannels; - constexpr float scale = 0x00FFFFFF; + constexpr double scale = 0x00FFFFFF; for (size_t frame = 0; frame < frames; ++frame) { for (int channel = 0; channel < channels; ++channel) @@ -955,7 +955,7 @@ namespace pipedal std::vector &buffers = this->playbackBuffers; int channels = this->playbackChannels; - constexpr float scale = std::numeric_limits::max(); + constexpr double scale = std::numeric_limits::max(); for (size_t frame = 0; frame < frames; ++frame) { for (int channel = 0; channel < channels; ++channel) @@ -975,7 +975,7 @@ namespace pipedal std::vector &buffers = this->playbackBuffers; int channels = this->playbackChannels; - constexpr float scale = std::numeric_limits::max(); + constexpr double scale = std::numeric_limits::max(); for (size_t frame = 0; frame < frames; ++frame) { for (int channel = 0; channel < channels; ++channel) @@ -1000,7 +1000,7 @@ namespace pipedal std::vector &buffers = this->playbackBuffers; int channels = this->playbackChannels; - constexpr float scale = std::numeric_limits::max(); + constexpr double scale = std::numeric_limits::max(); for (size_t frame = 0; frame < frames; ++frame) { for (int channel = 0; channel < channels; ++channel) diff --git a/src/AudioHost.cpp b/src/AudioHost.cpp index ded2b98..2e6a76e 100644 --- a/src/AudioHost.cpp +++ b/src/AudioHost.cpp @@ -867,6 +867,7 @@ private: pEffect->RequestAllPathPatchProperties(); } } + realtimeActivePedalboard->UpdateAudioPorts(); } reEntered = false; @@ -1696,7 +1697,6 @@ public: { if (pPedalboard) { - pPedalboard->Deactivate(); std::lock_guard guard(mutex); for (auto it = activePedalboards.begin(); it != activePedalboards.end(); ++it) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c5979e2..de7b3ba 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,7 +5,7 @@ set (CMAKE_INSTALL_PREFIX "/usr/") set (USE_PCH 1) -set (ENABLE_BACKTRACE 1) +set (ENABLE_BACKTRACE 0) set (USE_SANITIZE OFF) # seems to be broken on Ubuntu 24.10 diff --git a/src/ConfigMain.cpp b/src/ConfigMain.cpp index 11e6160..214168c 100644 --- a/src/ConfigMain.cpp +++ b/src/ConfigMain.cpp @@ -724,7 +724,8 @@ void SetVarPermissions( if (chown(entry.path().c_str(), uid, gid) != 0) { - std::cout << "Error: failed to set ownership of file " << entry.path() << std::endl; + // Expect spurious pulse config files to be un-chown-able. + // std::cout << "Error: failed to set ownership of file " << entry.path() << std::endl; } try @@ -740,7 +741,8 @@ void SetVarPermissions( } catch (const std::exception &e) { - std::cout << "Error: failed to set permissions on file " << entry.path() << std::endl; + // spurious errors on pulse config files. + // std::cout << "Error: failed to set permissions on file " << entry.path() << std::endl; } } } diff --git a/src/Lv2Effect.cpp b/src/Lv2Effect.cpp index 4680216..915164c 100644 --- a/src/Lv2Effect.cpp +++ b/src/Lv2Effect.cpp @@ -353,7 +353,6 @@ void Lv2Effect::PreparePortIndices() { this->isInputTriggerControlPort[portIndex] = true; } - } } } @@ -402,6 +401,13 @@ void Lv2Effect::SetAudioInputBuffer(int index, float *buffer) { this->inputAudioBuffers[index] = buffer; + if (borrowedEffect) + { + // Already running on the realtime thread, + // so don't update the audio ports until the effect gets placed on the realtime thread. + return; + } + if (inputAudioPortIndices.size() == inputAudioBuffers.size()) { int pluginIndex = this->inputAudioPortIndices[index]; @@ -409,12 +415,13 @@ void Lv2Effect::SetAudioInputBuffer(int index, float *buffer) } else { - // cases: 1->0, 1->1, 2->0, 2->1 - if (index < inputAudioPortIndices.size()) - { - int pluginIndex = this->inputAudioPortIndices[index]; - lilv_instance_connect_port(this->pInstance, pluginIndex, buffer); - } + throw std::runtime_error("Invalid input buffer index."); + // // cases: 1->0, 1->1, 2->0, 2->1 + // if (index < inputAudioPortIndices.size()) + // { + // int pluginIndex = this->inputAudioPortIndices[index]; + // lilv_instance_connect_port(this->pInstance, pluginIndex, buffer); + // } } } @@ -425,7 +432,7 @@ void Lv2Effect::SetAudioInputBuffer(float *left) SetAudioInputBuffer(0, left); SetAudioInputBuffer(1, left); } - else if (GetNumberOfInputAudioBuffers() != 0) + else if (GetNumberOfInputAudioBuffers() != 0) { SetAudioInputBuffer(0, left); } @@ -448,9 +455,16 @@ void Lv2Effect::SetAudioOutputBuffer(int index, float *buffer) { this->outputAudioBuffers[index] = buffer; + if (borrowedEffect) + { + // Effect is already running on the realtime thread, + // so don't update the audio ports until the updated pedalboard gets placed on the realtime thread. + return; + } + if (this->inputAudioPortIndices.size() != 0) // i.e. we're not mixing a zero-input control { - if ((size_t)index < this->inputAudioPortIndices.size()) + if ((size_t)index < this->outputAudioPortIndices.size()) { int pluginIndex = this->outputAudioPortIndices[index]; lilv_instance_connect_port(pInstance, pluginIndex, buffer); @@ -470,6 +484,10 @@ int Lv2Effect::GetControlIndex(const std::string &key) const Lv2Effect::~Lv2Effect() { + if (activated) + { + Deactivate(); + } if (worker) { worker->Close(); @@ -489,11 +507,40 @@ Lv2Effect::~Lv2Effect() void Lv2Effect::Activate() { + if (this->activated) + { + return; + } + this->activated = true; this->AssignUnconnectedPorts(); lilv_instance_activate(pInstance); this->BypassTo(this->bypass ? 1.0f : 0.0f); } +void Lv2Effect::UpdateAudioPorts() +{ + // called on realtime thread to switch borrowed effects to the new buffer pointers. + if (borrowedEffect) + { + for (size_t i = 0; i < this->inputAudioPortIndices.size(); ++i) + { + int portIndex = this->inputAudioPortIndices[i]; + if (GetAudioInputBuffer(i) != nullptr) + { + lilv_instance_connect_port(pInstance, portIndex, GetAudioInputBuffer(i)); + } + } + for (size_t i = 0; i < this->outputAudioPortIndices.size(); ++i) + { + int portIndex = this->outputAudioPortIndices[i]; + if (GetAudioOutputBuffer(i) != nullptr) + { + lilv_instance_connect_port(pInstance, portIndex, GetAudioOutputBuffer(i)); + } + } + } +} + void Lv2Effect::AssignUnconnectedPorts() { for (size_t i = 0; i < this->inputAudioPortIndices.size(); ++i) @@ -515,6 +562,7 @@ void Lv2Effect::AssignUnconnectedPorts() { float *buffer = bufferPool.AllocateBuffer(pHost->GetMaxAudioBufferSize()); int pluginIndex = this->outputAudioPortIndices[i]; + lilv_instance_connect_port(pInstance, pluginIndex, buffer); } } } @@ -545,6 +593,11 @@ void Lv2Effect::AssignUnconnectedPorts() } void Lv2Effect::Deactivate() { + if (!activated) + { + return; + } + activated = false; if (worker) { worker->Close(); @@ -591,15 +644,18 @@ void Lv2Effect::Run(uint32_t samples, RealtimeRingBufferWriter *realtimeRingBuff for (size_t i = 0; i < this->outputMixBuffers.size(); ++i) { float *__restrict input; - if (i >= this->inputAudioBuffers.size()) { + if (i >= this->inputAudioBuffers.size()) + { if (this->inputAudioBuffers.size() == 0) { break; } input = this->inputAudioBuffers[0]; - } else { + } + else + { input = this->inputAudioBuffers[i]; - } + } float *__restrict pluginOutput = this->outputMixBuffers[i].data(); float *__restrict finalOutput = this->outputAudioBuffers[i]; diff --git a/src/Lv2Effect.hpp b/src/Lv2Effect.hpp index bfb715b..27afc7b 100644 --- a/src/Lv2Effect.hpp +++ b/src/Lv2Effect.hpp @@ -199,9 +199,14 @@ namespace pipedal int actualAudioOutputs = 0; std::vector> outputMixBuffers; void BypassTo(float value); + bool borrowedEffect = false; + bool activated = false; public: - + bool IsBorrowedEffect() const { return borrowedEffect; } + void SetBorrowedEffect(bool value) { borrowedEffect = value; } + void UpdateAudioPorts(); + // non RT-thread use only. std::string GetPathPatchProperty(const std::string&propertyUri); // non RT-thread use only. diff --git a/src/Lv2Pedalboard.cpp b/src/Lv2Pedalboard.cpp index 2aa7806..8bed348 100644 --- a/src/Lv2Pedalboard.cpp +++ b/src/Lv2Pedalboard.cpp @@ -60,18 +60,20 @@ int Lv2Pedalboard::GetControlIndex(uint64_t instanceId, const std::string &symbo std::vector Lv2Pedalboard::PrepareItems( std::vector &items, std::vector inputBuffers, - Lv2PedalboardErrorList &errorList) + Lv2PedalboardErrorList &errorList, + ExistingEffectMap *existingEffects) { for (int i = 0; i < items.size(); ++i) { auto &item = items[i]; if (!item.isEmpty()) { - IEffect *pEffect = nullptr; + std::shared_ptr pEffect = nullptr; + if (item.isSplit()) { auto pSplit = new SplitEffect(item.instanceId(), pHost->GetSampleRate(), inputBuffers); - pEffect = pSplit; + pEffect = std::shared_ptr(pSplit); int topInputChannels = inputBuffers.size(); int bottomInputChannels = inputBuffers.size(); @@ -84,8 +86,8 @@ std::vector Lv2Pedalboard::PrepareItems( this->processActions.push_back(preMixAction); - std::vector topResult = PrepareItems(item.topChain(), topInputs, errorList); - std::vector bottomResult = PrepareItems(item.bottomChain(), bottomInputs, errorList); + std::vector topResult = PrepareItems(item.topChain(), topInputs, errorList,existingEffects); + std::vector bottomResult = PrepareItems(item.bottomChain(), bottomInputs, errorList,existingEffects); this->processActions.push_back( [pSplit](uint32_t frames) @@ -94,7 +96,7 @@ std::vector Lv2Pedalboard::PrepareItems( // if split is L/R, always output stereo. bool forceStereo = (controlValue != nullptr && controlValue->value() == 2); - pSplit->SetChainBuffers(topInputs, bottomInputs, topResult, bottomResult,forceStereo); + pSplit->SetChainBuffers(topInputs, bottomInputs, topResult, bottomResult, forceStereo); for (int i = 0; i < item.controlValues().size(); ++i) { @@ -108,31 +110,40 @@ std::vector Lv2Pedalboard::PrepareItems( } else { + std::shared_ptr pLv2Effect; - IEffect *pLv2Effect = nullptr; - try + if (existingEffects && existingEffects->contains(item.instanceId()) + ) { - pLv2Effect = this->pHost->CreateEffect(item); + pLv2Effect = existingEffects->at(item.instanceId()); + ((Lv2Effect*)pLv2Effect.get())->SetBorrowedEffect(true); } - catch (const std::exception &e) + else { - Lv2Log::warning(SS(e.what())); - } + try + { + pLv2Effect = std::shared_ptr(this->pHost->CreateEffect(item)); + } + catch (const std::exception &e) + { + Lv2Log::warning(SS(e.what())); + } - if (pLv2Effect) - { - - if (pLv2Effect->HasErrorMessage()) + if (pLv2Effect && pLv2Effect->HasErrorMessage()) { std::string error = pLv2Effect->TakeErrorMessage(); Lv2Log::error(error); errorList.push_back({item.instanceId(), error}); } + } + + if (pLv2Effect) + { pEffect = pLv2Effect; uint64_t instanceId = pEffect->GetInstanceId(); - pLv2Effect->PrepareNoInputEffect(inputBuffers.size(),pHost->GetMaxAudioBufferSize()); + pLv2Effect->PrepareNoInputEffect(inputBuffers.size(), pHost->GetMaxAudioBufferSize()); if (inputBuffers.size() == 1) { @@ -173,35 +184,34 @@ std::vector Lv2Pedalboard::PrepareItems( // Reset any trigger controls to default state after processing if (pLv2Effect->IsLv2Effect()) { - Lv2Effect*lv2Effect = (Lv2Effect*)pLv2Effect; + Lv2Effect *lv2Effect = (Lv2Effect *)pLv2Effect.get(); auto pluginInfo = pHost->GetPluginInfo(item.uri()); - if (pluginInfo) { - for (auto control: pluginInfo->ports()) + if (pluginInfo) + { + for (auto control : pluginInfo->ports()) { if (control->trigger_property() && control->is_input() && control->is_control_port()) { int controlIndex = lv2Effect->GetControlIndex(control->symbol()); - if (controlIndex >= 0) + if (controlIndex >= 0) { float defaultValue = control->default_value(); this->processActions.push_back( - [pLv2Effect,controlIndex,defaultValue](int32_t frames) { - pLv2Effect->SetControl(controlIndex,defaultValue); - } - ); + [pLv2Effect, controlIndex, defaultValue](int32_t frames) + { + pLv2Effect->SetControl(controlIndex, defaultValue); + }); } - } } } - } } } if (pEffect) { - this->effects.push_back(std::shared_ptr(pEffect)); // for ownership. - this->realtimeEffects.push_back(pEffect); // because std::shared_ptr is not threadsafe. + this->effects.push_back(pEffect); // for ownership. + this->realtimeEffects.push_back(pEffect.get()); // because std::shared_ptr is not threadsafe. std::vector effectOutput; @@ -214,7 +224,7 @@ std::vector Lv2Pedalboard::PrepareItems( effectOutput.push_back(CreateNewAudioBuffer()); effectOutput.push_back(CreateNewAudioBuffer()); } - for (size_t i = 0; i < effectOutput.size(); ++i) + for (size_t i = 0; i < effectOutput.size(); ++i) { pEffect->SetAudioOutputBuffer(i, effectOutput[i]); } @@ -225,7 +235,7 @@ std::vector Lv2Pedalboard::PrepareItems( return inputBuffers; } -void Lv2Pedalboard::Prepare(IHost *pHost, Pedalboard &pedalboard, Lv2PedalboardErrorList &errorList) +void Lv2Pedalboard::Prepare(IHost *pHost, Pedalboard &pedalboard, Lv2PedalboardErrorList &errorList, ExistingEffectMap *existingEffects) { this->pHost = pHost; @@ -242,7 +252,7 @@ void Lv2Pedalboard::Prepare(IHost *pHost, Pedalboard &pedalboard, Lv2PedalboardE this->pedalboardInputBuffers.push_back(bufferPool.AllocateBuffer(pHost->GetMaxAudioBufferSize())); } - auto outputs = PrepareItems(pedalboard.items(), this->pedalboardInputBuffers, errorList); + auto outputs = PrepareItems(pedalboard.items(), this->pedalboardInputBuffers, errorList, existingEffects); int nOutputs = pHost->GetNumberOfOutputAudioChannels(); if (nOutputs == 1) { @@ -276,7 +286,6 @@ void Lv2Pedalboard::PrepareMidiMap(const PedalboardItem &pedalboardItem) else { pluginInfo = pHost->GetPluginInfo(pedalboardItem.uri()); - } int effectIndex = this->GetIndexOfInstanceId(pedalboardItem.instanceId()); @@ -315,10 +324,15 @@ void Lv2Pedalboard::PrepareMidiMap(const PedalboardItem &pedalboardItem) mapping.midiBinding = binding; mapping.instanceId = pedalboardItem.instanceId(); - if (pPortInfo->trigger_property()) + if (pPortInfo->mod_momentaryOffByDefault() || pPortInfo->mod_momentaryOnByDefault()) + { + mapping.mappingType = MidiControlType::MomentarySwitch; + } + else if (pPortInfo->trigger_property()) { mapping.mappingType = MidiControlType::Trigger; - } else if (pPortInfo->IsSwitch()) + } + else if (pPortInfo->IsSwitch()) { mapping.mappingType = MidiControlType::Toggle; } @@ -326,7 +340,7 @@ void Lv2Pedalboard::PrepareMidiMap(const PedalboardItem &pedalboardItem) { mapping.mappingType = MidiControlType::Select; } - else + else { mapping.mappingType = MidiControlType::Dial; } @@ -365,12 +379,25 @@ void Lv2Pedalboard::PrepareMidiMap(const Pedalboard &pedalboard) { auto &item = pedalboard.items()[i]; PrepareMidiMap(item); - } std::sort(this->midiMappings.begin(), this->midiMappings.end(), - [](const MidiMapping &left, const MidiMapping &right) - { return left.key < right.key; }); + [](const MidiMapping &left, const MidiMapping &right) + { return left.key < right.key; }); } + +void Lv2Pedalboard::UpdateAudioPorts() +{ + for (int i = 0; i < this->effects.size(); ++i) + { + IEffect *effect = this->realtimeEffects[i]; + if (effect->IsLv2Effect()) + { + Lv2Effect *lv2Effect = (Lv2Effect *)effect; + lv2Effect->UpdateAudioPorts(); + } + } +} + void Lv2Pedalboard::Activate() { for (int i = 0; i < this->effects.size(); ++i) @@ -522,19 +549,18 @@ void Lv2Pedalboard::ResetAtomBuffers() } } - -void Lv2Pedalboard::GatherPathPatchProperties(IPatchWriterCallback*cbPatchWriter) +void Lv2Pedalboard::GatherPathPatchProperties(IPatchWriterCallback *cbPatchWriter) { - for (auto& pEffect : this->effects) { + for (auto &pEffect : this->effects) + { if (pEffect->IsLv2Effect()) { - Lv2Effect *pLv2Effect = (Lv2Effect*)pEffect.get(); + Lv2Effect *pLv2Effect = (Lv2Effect *)pEffect.get(); pLv2Effect->GatherPathPatchProperties(cbPatchWriter); } } } - void Lv2Pedalboard::ProcessParameterRequests(RealtimePatchPropertyRequest *pParameterRequests) { while (pParameterRequests != nullptr) @@ -572,7 +598,6 @@ void Lv2Pedalboard::ProcessParameterRequests(RealtimePatchPropertyRequest *pPara } } - void Lv2Pedalboard::GatherPatchProperties(RealtimePatchPropertyRequest *pParameterRequests) { while (pParameterRequests != nullptr) @@ -630,7 +655,7 @@ void Lv2Pedalboard::OnMidiMessage(size_t size, uint8_t *message, if (size < 3) return; index = message[1]; - value = message[2] == 0? 0: 127; // zero velocity = note off. + value = message[2] == 0 ? 0 : 127; // zero velocity = note off. } else if (cmd == 0xB0) // midi control. { @@ -689,22 +714,25 @@ void Lv2Pedalboard::OnMidiMessage(size_t size, uint8_t *message, case MidiControlType::Trigger: { bool triggered = false; - if (mapping.midiBinding.switchControlType() == SwitchControlTypeT::TRIGGER_ON_RISING_EDGE - || mapping.midiBinding.bindingType() == BINDING_TYPE_NOTE - ) + if (mapping.midiBinding.switchControlType() == SwitchControlTypeT::TRIGGER_ON_RISING_EDGE || mapping.midiBinding.bindingType() == BINDING_TYPE_NOTE) { if (mapping.lastValue < range) { - if (!mapping.lastValueIncreasing) { + if (!mapping.lastValueIncreasing) + { triggered = true; } mapping.lastValueIncreasing = true; mapping.lastValue = range; - } else { + } + else + { mapping.lastValueIncreasing = false; mapping.lastValue = range; } - } else { + } + else + { triggered = true; } if (triggered) @@ -730,12 +758,15 @@ void Lv2Pedalboard::OnMidiMessage(size_t size, uint8_t *message, { if (range > mapping.lastValue) { - if (!mapping.lastValueIncreasing) { + if (!mapping.lastValueIncreasing) + { triggered = true; } mapping.lastValueIncreasing = true; mapping.lastValue = range; - } else { + } + else + { mapping.lastValueIncreasing = false; mapping.lastValue = range; } @@ -748,30 +779,40 @@ void Lv2Pedalboard::OnMidiMessage(size_t size, uint8_t *message, pEffect->SetControl(mapping.controlIndex, currentValue); pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), currentValue); } - } else if (mapping.midiBinding.switchControlType() == SwitchControlTypeT::TOGGLE_ON_VALUE) + } + else if (mapping.midiBinding.switchControlType() == SwitchControlTypeT::TOGGLE_ON_VALUE) { triggered = true; mapping.lastValue = range; - IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; + IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; float currentValue = pEffect->GetControlValue(mapping.controlIndex); if (currentValue != range) { pEffect->SetControl(mapping.controlIndex, range); pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), range); } - - } else { + } + else + { // any control value toggles. triggered = true; mapping.lastValue = range; - IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; + IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; float currentValue = pEffect->GetControlValue(mapping.controlIndex); - currentValue = currentValue == 0 ? 1: 0; + currentValue = currentValue == 0 ? 1 : 0; pEffect->SetControl(mapping.controlIndex, currentValue); pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), currentValue); } break; } + case MidiControlType::MomentarySwitch: + { + IEffect *pEffect = this->realtimeEffects[mapping.effectIndex]; + pEffect->SetControl(mapping.controlIndex, range != 0 ? mapping.pPortInfo->max_value() : mapping.pPortInfo->min_value()); + // do NOT notify anyone! + } + break; + case MidiControlType::Select: case MidiControlType::Dial: { @@ -780,12 +821,12 @@ void Lv2Pedalboard::OnMidiMessage(size_t size, uint8_t *message, float currentValue = mapping.pPortInfo->rangeToValue(range); if (pEffect->GetControlValue(mapping.controlIndex) != currentValue) { - this->SetControlValue(mapping.effectIndex, mapping.controlIndex,currentValue); + this->SetControlValue(mapping.effectIndex, mapping.controlIndex, currentValue); pfnCallback(callbackHandle, mapping.instanceId, mapping.pPortInfo->index(), currentValue); } break; } - case MidiControlType::None: + case MidiControlType::None: default: break; } diff --git a/src/Lv2Pedalboard.hpp b/src/Lv2Pedalboard.hpp index 3ddcf29..4ae4420 100644 --- a/src/Lv2Pedalboard.hpp +++ b/src/Lv2Pedalboard.hpp @@ -35,6 +35,8 @@ namespace pipedal class RealtimePatchPropertyRequest; class RealtimeRingBufferWriter; + using ExistingEffectMap = std::map>; + struct Lv2PedalboardError { int64_t intanceId; @@ -78,7 +80,8 @@ namespace pipedal Select, Dial, Toggle, - Trigger + Trigger, + MomentarySwitch }; class MidiMapping { @@ -101,7 +104,8 @@ namespace pipedal std::vector PrepareItems( std::vector &items, std::vector inputBuffers, - Lv2PedalboardErrorList &errorList); + Lv2PedalboardErrorList &errorList, + ExistingEffectMap *existingEffects); void PrepareMidiMap(const Pedalboard &pedalboard); void PrepareMidiMap(const PedalboardItem &pedalboardItem); @@ -114,9 +118,12 @@ namespace pipedal Lv2Pedalboard() {} ~Lv2Pedalboard() {} - void Prepare(IHost *pHost, Pedalboard &pedalboard, Lv2PedalboardErrorList &errorList); + + void Prepare(IHost *pHost, Pedalboard &pedalboard, Lv2PedalboardErrorList &errorList, ExistingEffectMap *existingEffects = nullptr); std::vector &GetEffects() { return realtimeEffects; } + std::vector> &GetSharedEffectList() { return effects; } + int GetIndexOfInstanceId(uint64_t instanceId) { @@ -140,6 +147,8 @@ namespace pipedal } void Activate(); void Deactivate(); + void UpdateAudioPorts(); + bool Run(float **inputBuffers, float **outputBuffers, uint32_t samples, RealtimeRingBufferWriter *realtimeWriter); void ResetAtomBuffers(); diff --git a/src/MimeTypes.cpp b/src/MimeTypes.cpp index 702580d..86c3c99 100644 --- a/src/MimeTypes.cpp +++ b/src/MimeTypes.cpp @@ -167,6 +167,10 @@ MimeTypes::MimeTypes() AddMimeType("MPG", "video/mp2p"); AddMimeType("MPEG", "video/mp2p"); + // custom. + AddMimeType("NAM", "application/x-nam+json"); + + } const MimeTypes&MimeTypes::instance() diff --git a/src/PiPedalModel.cpp b/src/PiPedalModel.cpp index deb1109..dcefcaa 100644 --- a/src/PiPedalModel.cpp +++ b/src/PiPedalModel.cpp @@ -508,6 +508,7 @@ void PiPedalModel::FireBanksChanged(int64_t clientId) } } + void PiPedalModel::FirePedalboardChanged(int64_t clientId, bool loadAudioThread) { if (loadAudioThread) @@ -593,10 +594,28 @@ void PiPedalModel::UpdateCurrentPedalboard(int64_t clientId, Pedalboard &pedalbo UpdateVst3Settings(pedalboard); - this->pedalboard = pedalboard; - UpdateDefaults(&this->pedalboard); - this->FirePedalboardChanged(clientId); + + Lv2PedalboardErrorList errorMessages; + std::shared_ptr lv2Pedalboard{ + this->pluginHost.UpdateLv2PedalboardStructure(pedalboard, this->lv2Pedalboard.get(), errorMessages) + }; + this->lv2Pedalboard = lv2Pedalboard; + + // apply the error messages to the lv2Pedalboard. + // return true if the error messages have changed + audioHost->SetPedalboard(lv2Pedalboard); + this->pedalboard = pedalboard; + previousPedalboard = this->pedalboard; + previousPedalboardLoaded = true; + this->pedalboard = pedalboard; + + UpdateRealtimeVuSubscriptions(); + UpdateRealtimeMonitorPortSubscriptions(); + + + + this->FirePedalboardChanged(clientId,false); this->SetPresetChanged(clientId, true); } } @@ -2159,10 +2178,10 @@ void PiPedalModel::OnNotifyMidiListen(bool isNote, uint8_t noteOrControl) { std::lock_guard lock(mutex); - for (int i = 0; i < midiEventListeners.size(); ++i) + for (int i = 0; i < midiEventListeners.size(); ++i) { auto &listener = midiEventListeners[i]; - if ((!isNote) || (!listener.listenForControlsOnly)) + if ((!isNote) == (listener.listenForControls)) { auto subscriber = this->GetNotificationSubscriber(listener.clientId); if (subscriber) @@ -2179,10 +2198,10 @@ void PiPedalModel::OnNotifyMidiListen(bool isNote, uint8_t noteOrControl) audioHost->SetListenForMidiEvent(midiEventListeners.size() != 0); } -void PiPedalModel::ListenForMidiEvent(int64_t clientId, int64_t clientHandle, bool listenForControlsOnly) +void PiPedalModel::ListenForMidiEvent(int64_t clientId, int64_t clientHandle, bool listenForControls) { std::lock_guard lock(mutex); - MidiListener listener{clientId, clientHandle, listenForControlsOnly}; + MidiListener listener{clientId, clientHandle, listenForControls}; midiEventListeners.push_back(listener); audioHost->SetListenForMidiEvent(true); } @@ -2879,3 +2898,8 @@ void PiPedalModel::OnAlsaDriverTerminatedAbnormally() { } }); } + +bool PiPedalModel::IsInUploadsDirectory(const std::string &path) +{ + return storage.IsInUploadsDirectory(path); +} \ No newline at end of file diff --git a/src/PiPedalModel.hpp b/src/PiPedalModel.hpp index ffb016f..aa551cd 100644 --- a/src/PiPedalModel.hpp +++ b/src/PiPedalModel.hpp @@ -145,7 +145,7 @@ namespace pipedal public: int64_t clientId; int64_t clientHandle; - bool listenForControlsOnly; + bool listenForControls; }; class AtomOutputListener { @@ -436,7 +436,7 @@ namespace pipedal JackServerSettings GetJackServerSettings(); void SetJackServerSettings(const JackServerSettings &jackServerSettings); - void ListenForMidiEvent(int64_t clientId, int64_t clientHandle, bool listenForControlsOnly); + void ListenForMidiEvent(int64_t clientId, int64_t clientHandle, bool listenForControls); void CancelListenForMidiEvent(int64_t clientId, int64_t clientHandle); void MonitorPatchProperty(int64_t clientId, int64_t clientHandle, uint64_t instanceId, const std::string &propertyUri); @@ -456,6 +456,8 @@ namespace pipedal std::string RenameFilePropertyFile(const std::string &oldRelativePath, const std::string &newRelativePath, const UiFileProperty &uiFileProperty); FilePropertyDirectoryTree::ptr GetFilePropertydirectoryTree(const UiFileProperty &uiFileProperty,const std::string&selectedPath); + bool IsInUploadsDirectory(const std::string &path); + std::string UploadUserFile(const std::string &directory, int64_t instanceId, const std::string &patchProperty, const std::string &filename, std::istream &inputStream, size_t streamLength); uint64_t CreateNewPreset(); diff --git a/src/PiPedalSocket.cpp b/src/PiPedalSocket.cpp index 25cb8d1..a5efbe4 100644 --- a/src/PiPedalSocket.cpp +++ b/src/PiPedalSocket.cpp @@ -181,13 +181,13 @@ JSON_MAP_END() class ListenForMidiEventBody { public: - bool listenForControlsOnly_; + bool listenForControls_; int64_t handle_; DECLARE_JSON_MAP(ListenForMidiEventBody); }; JSON_MAP_BEGIN(ListenForMidiEventBody) -JSON_MAP_REFERENCE(ListenForMidiEventBody, listenForControlsOnly) +JSON_MAP_REFERENCE(ListenForMidiEventBody, listenForControls) JSON_MAP_REFERENCE(ListenForMidiEventBody, handle) JSON_MAP_END() @@ -1072,7 +1072,7 @@ public: { ListenForMidiEventBody body; pReader->read(&body); - this->model.ListenForMidiEvent(this->clientId, body.handle_, body.listenForControlsOnly_); + this->model.ListenForMidiEvent(this->clientId, body.handle_, body.listenForControls_); } else if (message == "cancelListenForMidiEvent") { diff --git a/src/PiPedalUI.hpp b/src/PiPedalUI.hpp index bad425a..df203f2 100644 --- a/src/PiPedalUI.hpp +++ b/src/PiPedalUI.hpp @@ -33,6 +33,10 @@ #include "ModFileTypes.hpp" +#define PIPEDAL_PATCH "http://github.com/rerdavies/pipedal/patch" +#define PIPEDAL_PATCH_PREFIX PIPEDAL_PATCH "#" +#define PIPEDAL_PATCH__readable (PIPEDAL_PATCH_PREFIX "readable") + #define PIPEDAL_UI "http://github.com/rerdavies/pipedal/ui" #define PIPEDAL_UI_PREFIX PIPEDAL_UI "#" diff --git a/src/PluginHost.cpp b/src/PluginHost.cpp index 8f2c84b..b8a9133 100644 --- a/src/PluginHost.cpp +++ b/src/PluginHost.cpp @@ -172,6 +172,8 @@ void PluginHost::LilvUris::Initialize(LilvWorld *pWorld) #define MOD_PREFIX "http://moddevices.com/ns/mod#" mod__label = lilv_new_uri(pWorld, MOD_PREFIX "label"); mod__brand = lilv_new_uri(pWorld, MOD_PREFIX "brand"); + mod__preferMomentaryOffByDefault = lilv_new_uri(pWorld, MOD_PREFIX "preferMomentaryOffByDefault"); + mod__preferMomentaryOnByDefault = lilv_new_uri(pWorld, MOD_PREFIX "preferMomentaryOnByDefault"); // ui:portNotification // [ // ui:portIndex 3; @@ -191,6 +193,7 @@ void PluginHost::LilvUris::Initialize(LilvWorld *pWorld) patch__writable = lilv_new_uri(pWorld, LV2_PATCH__writable); patch__readable = lilv_new_uri(pWorld, LV2_PATCH__readable); + pipedal_patch__readable = lilv_new_uri(pWorld, PIPEDAL_PATCH__readable); dc__format = lilv_new_uri(pWorld, "http://purl.org/dc/terms/format"); @@ -1000,7 +1003,8 @@ Lv2PortInfo::Lv2PortInfo(PluginHost *host, const LilvPlugin *plugin, const LilvP } } this->integer_property_ = lilv_port_has_property(plugin, pPort, host->lilvUris->integer_property_uri); - + this->mod_momentaryOffByDefault_ = lilv_port_has_property(plugin, pPort, host->lilvUris->mod__preferMomentaryOffByDefault); + this->mod_momentaryOnByDefault_ = lilv_port_has_property(plugin, pPort, host->lilvUris->mod__preferMomentaryOnByDefault); this->enumeration_property_ = lilv_port_has_property(plugin, pPort, host->lilvUris->enumeration_property_uri); this->toggled_property_ = lilv_port_has_property(plugin, pPort, host->lilvUris->core__toggled); @@ -1238,6 +1242,32 @@ std::shared_ptr PluginHost::GetPluginInfo(const std::string &uri) return ff->second; } +Lv2Pedalboard *PluginHost::UpdateLv2PedalboardStructure(Pedalboard &pedalboard,Lv2Pedalboard *existingPedalboard,Lv2PedalboardErrorList &errorList) +{ + ExistingEffectMap existingEffects; + + if (existingPedalboard) + { + for (auto &effect : existingPedalboard->GetSharedEffectList()) + { + if (effect->IsLv2Effect()) { + existingEffects[effect->GetInstanceId()] = effect; + } + } + } + Lv2Pedalboard *pPedalboard = new Lv2Pedalboard(); + try + { + pPedalboard->Prepare(this, pedalboard, errorList,&existingEffects); + return pPedalboard; + } + catch (const std::exception &e) + { + delete pPedalboard; + throw; + } +} + Lv2Pedalboard *PluginHost::CreateLv2Pedalboard(Pedalboard &pedalboard, Lv2PedalboardErrorList &errorMessages) { Lv2Pedalboard *pPedalboard = new Lv2Pedalboard(); @@ -1697,6 +1727,8 @@ json_map::storage_type Lv2PortInfo::jmap{ MAP_REF(Lv2PortInfo, integer_property), MAP_REF(Lv2PortInfo, enumeration_property), MAP_REF(Lv2PortInfo, toggled_property), + MAP_REF(Lv2PortInfo, mod_momentaryOffByDefault), + MAP_REF(Lv2PortInfo, mod_momentaryOnByDefault), MAP_REF(Lv2PortInfo, not_on_gui), MAP_REF(Lv2PortInfo, buffer_type), MAP_REF(Lv2PortInfo, port_group), @@ -1761,6 +1793,9 @@ json_map::storage_type Lv2PluginUiPort::jmap{{ MAP_REF(Lv2PluginUiPort, range_steps), MAP_REF(Lv2PluginUiPort, integer_property), + + MAP_REF(Lv2PluginUiPort, mod_momentaryOffByDefault), + MAP_REF(Lv2PluginUiPort, mod_momentaryOnByDefault), MAP_REF(Lv2PluginUiPort, enumeration_property), MAP_REF(Lv2PluginUiPort, not_on_gui), MAP_REF(Lv2PluginUiPort, toggled_property), diff --git a/src/PluginHost.hpp b/src/PluginHost.hpp index c018ad3..c6dc501 100644 --- a/src/PluginHost.hpp +++ b/src/PluginHost.hpp @@ -218,6 +218,10 @@ namespace pipedal bool integer_property_ = false; bool enumeration_property_ = false; bool toggled_property_ = false; + + bool mod_momentaryOffByDefault_ = false; + bool mod_momentaryOnByDefault_ = false; + bool not_on_gui_ = false; std::string buffer_type_; std::string port_group_; @@ -288,6 +292,8 @@ namespace pipedal LV2_PROPERTY_GETSET_SCALAR(range_steps); LV2_PROPERTY_GETSET_SCALAR(trigger_property); LV2_PROPERTY_GETSET_SCALAR(integer_property); + LV2_PROPERTY_GETSET_SCALAR(mod_momentaryOffByDefault); + LV2_PROPERTY_GETSET_SCALAR(mod_momentaryOnByDefault); LV2_PROPERTY_GETSET_SCALAR(enumeration_property); LV2_PROPERTY_GETSET_SCALAR(toggled_property); LV2_PROPERTY_GETSET_SCALAR(not_on_gui); @@ -503,7 +509,12 @@ namespace pipedal : symbol_(pPort->symbol()), index_(pPort->index()), is_input_(pPort->is_input()), name_(pPort->name()), min_value_(pPort->min_value()), max_value_(pPort->max_value()), default_value_(pPort->default_value()), range_steps_(pPort->range_steps()), display_priority_(pPort->display_priority()), - is_logarithmic_(pPort->is_logarithmic()), integer_property_(pPort->integer_property()), enumeration_property_(pPort->enumeration_property()), + is_logarithmic_(pPort->is_logarithmic()), + integer_property_(pPort->integer_property()), + mod_momentaryOffByDefault_(pPort->mod_momentaryOffByDefault()), + mod_momentaryOnByDefault_(pPort->mod_momentaryOnByDefault()), + + enumeration_property_(pPort->enumeration_property()), toggled_property_(pPort->toggled_property()), not_on_gui_(pPort->not_on_gui()), scale_points_(pPort->scale_points()), trigger_property_(pPort->trigger_property()), pipedal_ledColor_(pPort->pipedal_ledColor()), @@ -544,6 +555,9 @@ namespace pipedal int range_steps_ = 0; bool integer_property_ = false; + + bool mod_momentaryOffByDefault_ = false; + bool mod_momentaryOnByDefault_ = false; bool enumeration_property_ = false; bool not_on_gui_ = false; bool toggled_property_ = false; @@ -743,10 +757,12 @@ namespace pipedal AutoLilvNode patch__writable; AutoLilvNode patch__readable; + AutoLilvNode pipedal_patch__readable; AutoLilvNode mod__brand; AutoLilvNode mod__label; - + AutoLilvNode mod__preferMomentaryOffByDefault; + AutoLilvNode mod__preferMomentaryOnByDefault; AutoLilvNode dc__format; AutoLilvNode mod__fileTypes; @@ -885,6 +901,8 @@ namespace pipedal virtual Lv2Pedalboard *CreateLv2Pedalboard(Pedalboard &pedalboard,Lv2PedalboardErrorList &errorList); + virtual Lv2Pedalboard *UpdateLv2PedalboardStructure(Pedalboard &pedalboard,Lv2Pedalboard *existingPedalboard,Lv2PedalboardErrorList &errorList); + void setSampleRate(double sampleRate) { this->sampleRate = sampleRate; diff --git a/src/RingBuffer.hpp b/src/RingBuffer.hpp index e4b02e8..fa56810 100644 --- a/src/RingBuffer.hpp +++ b/src/RingBuffer.hpp @@ -153,7 +153,7 @@ namespace pipedal } } template - RingBufferStatus readWait_until(size_t size,const std::chrono::time_point &time_point) + RingBufferStatus readWait_until(size_t size, const std::chrono::time_point &time_point) { while (true) { @@ -161,7 +161,7 @@ namespace pipedal { std::unique_lock lock(mutex); size_t available = readSpace_(); - if (available >= size) + if (available >= size) { return RingBufferStatus::Ready; } @@ -215,12 +215,13 @@ namespace pipedal return (size_t)size; } - size_t readSpace() { std::unique_lock lock(mutex); return readSpace_(); } + + bool write(size_t bytes, uint8_t *data) { if (MULTI_WRITER) @@ -273,7 +274,7 @@ namespace pipedal if (MULTI_WRITER) { std::lock_guard guard(writeMutex); - if (writeSpace() <= sizeof(bytes) + bytes +bytes2) + if (writeSpace() <= sizeof(bytes) + bytes + bytes2) { return false; } @@ -340,6 +341,23 @@ namespace pipedal } } + size_t read_packet(size_t maxSize, void*data) { + size_t packet_size; + if (!read(sizeof(packet_size), (uint8_t*)&packet_size)) + { + throw std::runtime_error("RingBuffer::read_packet: failed to read packet size."); + } + if (packet_size > maxSize) + { + throw std::runtime_error("RingBuffer::read_packet: packet size too large."); + } + if (!read(packet_size, (uint8_t*)data)) + { + throw std::runtime_error("RingBuffer::read_packet: failed to read packet data."); + } + return packet_size; + } + bool read(size_t bytes, uint8_t *data) { if (readSpace() < bytes) @@ -366,18 +384,20 @@ namespace pipedal delete[] buffer; } - bool isReadReady() { + bool isReadReady() + { std::lock_guard lock(mutex); - if (isReadReady_()) return true; + if (isReadReady_()) + return true; return !this->is_open; } - bool isReadReady(size_t size) { + bool isReadReady(size_t size) + { size_t available = readSpace(); return available >= size; } private: - size_t readSpace_() { int64_t size = writePosition - readPosition; @@ -389,7 +409,7 @@ namespace pipedal uint32_t peekSize() { volatile uint32_t result; - uint8_t *p = (uint8_t*)&result; + uint8_t *p = (uint8_t *)&result; size_t ix = this->readPosition; for (size_t i = 0; i < sizeof(result); ++i) { @@ -400,14 +420,12 @@ namespace pipedal bool isReadReady_() { size_t available = readSpace_(); - if (available < sizeof(uint32_t)) return false; + if (available < sizeof(uint32_t)) + return false; // peak to get the size! uint32_t packetSize = peekSize(); - return packetSize+sizeof(uint32_t) <= available; + return packetSize + sizeof(uint32_t) <= available; } - - }; - }; diff --git a/src/RingBufferReader.hpp b/src/RingBufferReader.hpp index 25e6dd0..634d354 100644 --- a/src/RingBufferReader.hpp +++ b/src/RingBufferReader.hpp @@ -327,6 +327,7 @@ namespace pipedal return; } } + template void write(RingBufferCommand command, const T &value, size_t dataLength, uint8_t *variableData) { diff --git a/src/WebServerConfig.cpp b/src/WebServerConfig.cpp index c42488c..a46ca0e 100644 --- a/src/WebServerConfig.cpp +++ b/src/WebServerConfig.cpp @@ -34,6 +34,7 @@ #include "PresetBundle.hpp" #include "json.hpp" #include "HotspotManager.hpp" +#include "MimeTypes.hpp" #define OLD_PRESET_EXTENSION ".piPreset" #define PRESET_EXTENSION ".piPreset" @@ -51,6 +52,22 @@ using namespace pipedal; using namespace boost::system; namespace fs = std::filesystem; + + +static bool HasDotDot(const std::filesystem::path &path) { + for (auto &part : path) + { + if (part == "..") { + return true; + } + if (part == ".") + { + return true; + } + } + return false; +} + class UserUploadResponse { public: @@ -63,6 +80,13 @@ JSON_MAP_REFERENCE(UserUploadResponse, errorMessage) JSON_MAP_REFERENCE(UserUploadResponse, path) JSON_MAP_END() +static std::string GetMimeType(const std::filesystem::path&path) { + std::string extension = path.extension(); + const MimeTypes&mimeTypes = MimeTypes::instance(); + auto result = mimeTypes.MimeTypeFromExtension(extension); + return result; + +} static bool IsZipFile(const std::filesystem::path &path) { std::ifstream f(path); @@ -119,6 +143,10 @@ public: return false; } std::string segment = request_uri.segment(1); + if (segment == "downloadMediaFile") + { + return true; + } if (segment == "uploadPluginPresets") { return true; @@ -154,7 +182,7 @@ public: return false; } - std::string GetContentDispositionHeader(const std::string &name, const std::string &extension) + static std::string GetContentDispositionHeader(const std::string &name, const std::string &extension) { std::string fileName = name.substr(0, 64) + extension; std::stringstream s; @@ -218,6 +246,26 @@ public: try { std::string segment = request_uri.segment(1); + if (segment == "downloadMediaFile") { + fs::path path = request_uri.query("path"); + + if (!fs::exists(path) || !this->model->IsInUploadsDirectory(path) || HasDotDot(path)) + { + throw PiPedalException("File not found."); + } + auto mimeType = GetMimeType(path); + if (mimeType.empty()) { + throw PiPedalException("Can't download files of this type."); + } + res.set(HttpField::content_type, mimeType); + res.set(HttpField::cache_control, "no-cache"); + std::string disposition = GetContentDispositionHeader(path.stem().string(), path.extension().string()); + res.set(HttpField::content_disposition, disposition); + size_t contentLength = std::filesystem::file_size(path); + res.setContentLength(contentLength); + return; + } + if (segment == "downloadPluginPresets") { std::string name; @@ -235,6 +283,7 @@ public: res.set(HttpField::content_disposition, GetContentDispositionHeader(name, PLUGIN_PRESETS_EXTENSION)); return; } + if (segment == "downloadPreset") { std::string name; @@ -294,7 +343,29 @@ public: { std::string segment = request_uri.segment(1); - if (segment == "downloadPluginPresets") + if (segment == "downloadMediaFile") { + fs::path path = request_uri.query("path"); + + bool t = this->model->IsInUploadsDirectory(path); + std::cout << (t? "true": "false") << std::endl; + (void)t; + if (!fs::exists(path) || !this->model->IsInUploadsDirectory(path) || HasDotDot(path)) + { + throw PiPedalException("File not found."); + } + auto mimeType = GetMimeType(path); + if (mimeType.empty()) { + throw PiPedalException("Can't download files of this type."); + } + res.set(HttpField::content_type, mimeType); + res.set(HttpField::cache_control, "no-cache"); + std::string disposition = GetContentDispositionHeader(path.stem().string(), path.extension().string()); + res.set(HttpField::content_disposition, disposition); + size_t contentLength = std::filesystem::file_size(path); + res.setContentLength(contentLength); + res.setBodyFile(path,false); + return; + } else if (segment == "downloadPluginPresets") { std::string name; std::string content; diff --git a/vite/debug.sh b/vite/debug.sh new file mode 100755 index 0000000..9ff56c7 --- /dev/null +++ b/vite/debug.sh @@ -0,0 +1,2 @@ +#!/bin/bash +npm run dev -- --host 0.0.0.0 diff --git a/vite/package-lock.json b/vite/package-lock.json index 58d5300..3b725a3 100644 --- a/vite/package-lock.json +++ b/vite/package-lock.json @@ -29,7 +29,7 @@ "@vitejs/plugin-react": "^4.3.4", "eslint": "^9.19.0", "eslint-plugin-react-hooks": "^5.0.0", - "eslint-plugin-react-refresh": "^0.4.18", + "eslint-plugin-react-refresh": "^0.4.19", "globals": "^15.14.0", "typescript": "~5.7.2", "typescript-eslint": "^8.22.0", diff --git a/vite/package.json b/vite/package.json index bcf96f2..45b7618 100644 --- a/vite/package.json +++ b/vite/package.json @@ -31,7 +31,7 @@ "@vitejs/plugin-react": "^4.3.4", "eslint": "^9.19.0", "eslint-plugin-react-hooks": "^5.0.0", - "eslint-plugin-react-refresh": "^0.4.18", + "eslint-plugin-react-refresh": "^0.4.19", "globals": "^15.14.0", "typescript": "~5.7.2", "typescript-eslint": "^8.22.0", diff --git a/vite/src/pipedal/AppThemed.tsx b/vite/src/pipedal/AppThemed.tsx index 8461fa9..3a32d70 100644 --- a/vite/src/pipedal/AppThemed.tsx +++ b/vite/src/pipedal/AppThemed.tsx @@ -44,7 +44,7 @@ import ListItemIcon from '@mui/material/ListItemIcon'; import ListItemText from '@mui/material/ListItemText'; import CircularProgress from '@mui/material/CircularProgress'; import { type OnChangedHandler } from './ObservableProperty'; -import ErrorOutlineIcon from '@mui/icons-material/Error'; +import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline'; import ResizeResponsiveComponent from './ResizeResponsiveComponent'; import Button from '@mui/material/Button'; import PresetSelector from './PresetSelector'; diff --git a/vite/src/pipedal/FilePropertyDialog.tsx b/vite/src/pipedal/FilePropertyDialog.tsx index 4a02bd7..019bc2b 100644 --- a/vite/src/pipedal/FilePropertyDialog.tsx +++ b/vite/src/pipedal/FilePropertyDialog.tsx @@ -19,7 +19,7 @@ import React from 'react'; -import {createStyles} from './WithStyles'; +import { createStyles } from './WithStyles'; import { Theme } from '@mui/material/styles'; @@ -33,6 +33,7 @@ import { PiPedalModel, PiPedalModelFactory, FileEntry, BreadcrumbEntry, FileRequ import { isDarkMode } from './DarkMode'; import Button from '@mui/material/Button'; import FileUploadIcon from '@mui/icons-material/FileUpload'; +import FileDownloadIcon from '@mui/icons-material/FileDownload'; import AudioFileIcon from '@mui/icons-material/AudioFile'; import ArrowBackIcon from '@mui/icons-material/ArrowBack'; import FolderIcon from '@mui/icons-material/Folder'; @@ -100,6 +101,7 @@ export interface FilePropertyDialogProps extends WithStyles { instanceId: number, selectedFile: string, onOk: (fileProperty: UiFileProperty, selectedItem: string) => void, + onApply: (fileProperty: UiFileProperty, selectedItem: string) => void, onCancel: () => void }; export interface FilePropertyDialogState { @@ -108,9 +110,11 @@ export interface FilePropertyDialogState { selectedFileIsDirectory: boolean; selectedFileProtected: boolean; hasSelection: boolean; + hasFileSelection: boolean; canDelete: boolean; fileResult: FileRequestResult; navDirectory: string; + windowWidth: number; uploadDirectory: string; isProtectedDirectory: boolean; columns: number; @@ -121,6 +125,7 @@ export interface FilePropertyDialogState { newFolderDialogOpen: boolean; renameDialogOpen: boolean; moveDialogOpen: boolean; + initialSelection: string; }; function pathExtension(path: string) { @@ -199,10 +204,12 @@ export default withStyles( fullScreen: this.getFullScreen(), selectedFile: selectedFile, selectedFileProtected: true, + windowWidth: this.windowSize.width, selectedFileIsDirectory: false, navDirectory: this.getNavDirectoryFromFile(selectedFile, props.fileProperty), uploadDirectory: "", hasSelection: false, + hasFileSelection: false, canDelete: false, columns: 0, columnWidth: 1, @@ -213,7 +220,8 @@ export default withStyles( menuAnchorEl: null, newFolderDialogOpen: false, renameDialogOpen: false, - moveDialogOpen: false + moveDialogOpen: false, + initialSelection: this.props.selectedFile }; this.requestScroll = true; } @@ -259,12 +267,13 @@ export default withStyles( // } filesResult.files.splice(0, 0, { pathname: "", displayName: "", isDirectory: false, isProtected: true }); - let fileEntry = this.getFileEntry(filesResult.files, this.state.selectedFile); + let fileEntry = this.getFileEntry(filesResult.files, this.state.selectedFile); this.setState({ isProtectedDirectory: filesResult.isProtected, fileResult: filesResult, hasSelection: !!fileEntry, - selectedFileProtected: fileEntry ? fileEntry.isProtected: true, + hasFileSelection: !!fileEntry && (!fileEntry.isDirectory) && (!fileEntry.isProtected), + selectedFileProtected: fileEntry ? fileEntry.isProtected : true, navDirectory: navPath, uploadDirectory: filesResult.currentDirectory }); @@ -297,7 +306,8 @@ export default withStyles( onWindowSizeChanged(width: number, height: number): void { this.setState({ - fullScreen: this.getFullScreen() + fullScreen: this.getFullScreen(), + windowWidth: width }) if (this.lastDivRef !== null) { this.onMeasureRef(this.lastDivRef); @@ -373,11 +383,16 @@ export default withStyles( onSelectValue(fileEntry: FileEntry) { this.requestScroll = true; + if (!fileEntry.isDirectory) + { + this.props.onApply(this.props.fileProperty,fileEntry.pathname); + } this.setState({ selectedFile: fileEntry.pathname, selectedFileIsDirectory: fileEntry.isDirectory, selectedFileProtected: fileEntry.isProtected, - hasSelection: this.isFileInList(this.state.fileResult.files, fileEntry.pathname) + hasSelection: this.isFileInList(this.state.fileResult.files, fileEntry.pathname), + hasFileSelection: !fileEntry.isDirectory && !fileEntry.isDirectory && !fileEntry.isProtected }) } onDoubleClickValue(selectedFile: string) { @@ -392,14 +407,21 @@ export default withStyles( this.setState({ menuAnchorEl: null }); } handleDelete() { - if (this.state.selectedFileProtected) { - return; + if (this.state.selectedFileProtected) { + return; } this.setState({ openConfirmDeleteDialog: true }); } + handleDownloadFile() { + if (this.state.selectedFileProtected || !this.state.hasFileSelection) { + return; + } + let file = this.state.selectedFile; + this.model.downloadAudioFile(file); + } handleConfirmDelete() { - if (this.state.selectedFileProtected) { - return; + if (this.state.selectedFileProtected) { + return; } this.setState({ openConfirmDeleteDialog: false }); if (this.state.hasSelection) { @@ -424,20 +446,21 @@ export default withStyles( this.model.deleteUserFile(this.state.selectedFile) .then( () => { - if (newSelection) - { - this.setState({ + if (newSelection) { + this.setState({ selectedFile: newSelection.pathname, selectedFileIsDirectory: newSelection.isDirectory, selectedFileProtected: newSelection.isProtected, - hasSelection: true + hasSelection: true, + hasFileSelection: !newSelection.isDirectory && !newSelection.isProtected }); } else { this.setState({ selectedFile: "", selectedFileIsDirectory: false, selectedFileProtected: true, - hasSelection: false + hasSelection: false, + hasFileSelection: false }); } @@ -580,8 +603,7 @@ export default withStyles( } let protectedDirectory = this.state.fileResult.isProtected; let protectedItem = true; - if (this.state.hasSelection) - { + if (this.state.hasSelection) { protectedItem = this.state.selectedFileProtected; } let canMoveOrRename = this.hasSelectedFileOrFolder() && !protectedItem; @@ -719,31 +741,82 @@ export default withStyles( -
- this.handleDelete()} > - - + {this.state.windowWidth > 500 ? ( +
+ this.handleDelete()} > + + - -
 
+ - - - disabled={(!this.state.hasSelection) && this.state.selectedFile !== ""} aria-label="select" - > - {okButtonText} - -
+
 
+ + + +
+ ) : ( +
+
+ this.handleDelete()} > + + + + + + + +
 
+
+
+
 
+ + + +
+
+ )} { - this.setState({ + this.setState({ selectedFile: newPath, - selectedFileIsDirectory: - true,selectedFileProtected: false + selectedFileIsDirectory: + true, selectedFileProtected: false }); this.requestFiles(this.state.navDirectory); this.requestScroll = true diff --git a/vite/src/pipedal/GxTunerControl.tsx b/vite/src/pipedal/GxTunerControl.tsx index e73e127..0171975 100644 --- a/vite/src/pipedal/GxTunerControl.tsx +++ b/vite/src/pipedal/GxTunerControl.tsx @@ -197,7 +197,7 @@ const GxTunerControl = let nameIndex = noteNumber -octave* tet; if (nameIndex < 0) nameIndex += tet; - name = names[ nameIndex ] + (octave-2); + name = names[ nameIndex ] + (octave-1); valid = true; fraction = note-noteNumber; if (fraction >= 0) { diff --git a/vite/src/pipedal/Lv2Plugin.tsx b/vite/src/pipedal/Lv2Plugin.tsx index 6192ab9..e9c8ba7 100644 --- a/vite/src/pipedal/Lv2Plugin.tsx +++ b/vite/src/pipedal/Lv2Plugin.tsx @@ -451,9 +451,12 @@ export enum ControlType { ABSwitch, Select, Trigger, + Momentary, + MomentaryOnByDefault, Tuner, Vu, + Progress, DbVu, OutputText } @@ -494,6 +497,8 @@ deserialize(input: any): UiControl { this.display_priority = input.display_priority; this.range_steps = input.range_steps; this.integer_property = input.integer_property; + this.mod_momentaryOffByDefault = input.mod_momentaryOffByDefault; + this.mod_momentaryOnByDefault = input.mod_momentaryOnByDefault; this.enumeration_property = input.enumeration_property; this.toggled_property = input.toggled_property; this.trigger_property = input.trigger_property; @@ -522,6 +527,8 @@ deserialize(input: any): UiControl { } else if (this.units === Units.db) { this.controlType = ControlType.DbVu; + } else if (this.units === Units.pc) { + this.controlType = ControlType.Progress; } else if (this.enumeration_property) { this.controlType = ControlType.OutputText; } else if (displayUnitAsText(this.units)) @@ -533,7 +540,7 @@ deserialize(input: any): UiControl { } if (this.isValidEnumeration()) { this.controlType = ControlType.Select; - if (this.scale_points.length === 2) { + if (this.scale_points.length === 2 && this.min_value === 0 && this.max_value === 1) { this.controlType = ControlType.ABSwitch; } } else { @@ -541,9 +548,15 @@ deserialize(input: any): UiControl { this.controlType = ControlType.OnOffSwitch; } } - if (this.is_input && this.trigger_property) + if (this.is_input) { - this.controlType = ControlType.Trigger; + if (this.mod_momentaryOnByDefault) { + this.controlType = ControlType.MomentaryOnByDefault; + } else if (this.mod_momentaryOffByDefault) { + this.controlType = ControlType.Momentary; + } else if (this.trigger_property) { + this.controlType = ControlType.Trigger; + } } return this; } @@ -591,6 +604,8 @@ deserialize(input: any): UiControl { display_priority: number = -1; range_steps: number = 0; integer_property: boolean = false; + mod_momentaryOffByDefault: boolean = false; + mod_momentaryOnByDefault: boolean = false; enumeration_property: boolean = false; trigger_property: boolean = false; not_on_gui: boolean = false; @@ -640,6 +655,14 @@ deserialize(input: any): UiControl { isTrigger(): boolean { return this.controlType === ControlType.Trigger; } + isMomentary(): boolean { + return this.controlType === ControlType.Momentary; + } + isMomentaryOnByDefault(): boolean { + return this.controlType === ControlType.MomentaryOnByDefault; + } + + isOutputText(): boolean { return !this.is_input && this.controlType === ControlType.OutputText; } @@ -662,6 +685,9 @@ deserialize(input: any): UiControl { isDbVu(): boolean { return this.controlType === ControlType.DbVu; } + isProgress(): boolean { + return this.controlType === ControlType.Progress; + } valueToRange(value: number): number { if (this.toggled_property) return value === 0 ? 0 : 1; diff --git a/vite/src/pipedal/MidiBindingView.tsx b/vite/src/pipedal/MidiBindingView.tsx index 0387b44..1eeadb6 100644 --- a/vite/src/pipedal/MidiBindingView.tsx +++ b/vite/src/pipedal/MidiBindingView.tsx @@ -48,10 +48,11 @@ const styles = (theme: Theme) => createStyles({ enum MidiControlType { None, + Select, + Dial, Toggle, Trigger, - Dial, - Select, + MomentarySwitch } interface MidiBindingViewProps extends WithStyles { @@ -149,7 +150,7 @@ const MidiBindingView = for (let i = 0; i < 127; ++i) { result.push( - {Utility.midiNoteName(i)} + {Utility.midiNoteName(i)} ) } @@ -188,6 +189,12 @@ const MidiBindingView = let port = this.props.uiPlugin.getControl(this.props.midiBinding.symbol); if (!port) return MidiControlType.None; + if (port.mod_momentaryOffByDefault || port.mod_momentaryOnByDefault) { + return MidiControlType.MomentarySwitch; + } + if (port.trigger_property) { + return MidiControlType.Trigger; + } if (port.trigger_property) { return MidiControlType.Trigger; } @@ -230,7 +237,9 @@ const MidiBindingView = value={midiBinding.bindingType} > None - {(controlType === MidiControlType.Toggle || controlType === MidiControlType.Trigger) && ( + {(controlType === MidiControlType.Toggle + || controlType === MidiControlType.Trigger + || controlType === MidiControlType.MomentarySwitch) && ( Note )} Control diff --git a/vite/src/pipedal/MidiBindingsDialog.tsx b/vite/src/pipedal/MidiBindingsDialog.tsx index 6810438..1b846e4 100644 --- a/vite/src/pipedal/MidiBindingsDialog.tsx +++ b/vite/src/pipedal/MidiBindingsDialog.tsx @@ -24,7 +24,7 @@ import { PiPedalModel, PiPedalModelFactory, ListenHandle } from './PiPedalModel' import Typography from '@mui/material/Typography'; import { Theme } from '@mui/material/styles'; import WithStyles from './WithStyles'; -import {createStyles} from './WithStyles'; +import { createStyles } from './WithStyles'; import { withStyles } from "tss-react/mui"; import AppBar from '@mui/material/AppBar'; @@ -34,7 +34,7 @@ import IconButton from '@mui/material/IconButton'; import MidiBinding from './MidiBinding'; import MidiBindingView from './MidiBindingView'; import Snackbar from '@mui/material/Snackbar'; -import { UiPlugin,makeSplitUiPlugin } from './Lv2Plugin'; +import { PortGroup, UiPlugin, makeSplitUiPlugin } from './Lv2Plugin'; import { css } from '@emotion/react'; const styles = (theme: Theme) => createStyles({ @@ -54,6 +54,11 @@ const styles = (theme: Theme) => createStyles({ pluginHead: css({ borderTop: "1pt #DDD solid", paddingLeft: 22, paddingRight: 22 }), + groupHead: css({ + borderBottom: "1px solid " + theme.palette.divider, + marginLeft: 0, + marginBottom: 0 + }), bindingTd: css({ verticalAlign: "top", paddingLeft: 12, paddingBottom: 8 @@ -65,7 +70,7 @@ const styles = (theme: Theme) => createStyles({ }), }); -function not_null(value: T | null) { +function not_null(value: T | null) { if (!value) throw Error("Unexpected null value"); return value; } @@ -116,8 +121,7 @@ export const MidiBindingDialog = clearTimeout(this.listenTimeoutHandle); this.listenTimeoutHandle = undefined; } - if (this.listenHandle) - { + if (this.listenHandle) { this.model.cancelListenForMidiEvent(this.listenHandle) this.listenHandle = undefined; } @@ -126,10 +130,9 @@ export const MidiBindingDialog = } - handleListenSucceeded(instanceId: number, symbol: string, isNote: boolean, noteOrControl: number) - { + handleListenSucceeded(instanceId: number, symbol: string, isNote: boolean, noteOrControl: number) { this.cancelListenForControl(); - + let pedalboard = this.model.pedalboard.get(); let item = pedalboard.getItem(instanceId); if (!item) return; @@ -144,7 +147,7 @@ export const MidiBindingDialog = newBinding.control = noteOrControl; } - this.model.setMidiBinding(instanceId,newBinding); + this.model.setMidiBinding(instanceId, newBinding); } @@ -157,9 +160,9 @@ export const MidiBindingDialog = this.listenHandle = this.model.listenForMidiEvent(listenForControl, (isNote: boolean, noteOrControl: number) => { - this.handleListenSucceeded(instanceId,symbol,isNote, noteOrControl); + this.handleListenSucceeded(instanceId, symbol, isNote, noteOrControl); }); - + } @@ -190,6 +193,7 @@ export const MidiBindingDialog = let pedalboard = this.model.pedalboard.get(); let iter = pedalboard.itemsGenerator(); + let keyIx = 1; while (true) { let v = iter.next(); if (v.done) break; @@ -197,45 +201,43 @@ export const MidiBindingDialog = let isSplit = item.uri === "uri://two-play/pipedal/pedalboard#Split"; - let plugin : UiPlugin | null = this.model.getUiPlugin(item.uri); - if (plugin === null && isSplit) - { + let plugin: UiPlugin | null = this.model.getUiPlugin(item.uri); + if (plugin === null && isSplit) { plugin = makeSplitUiPlugin(); let splitType = item.getControlValue("splitType"); not_null(plugin.getControl("splitType")).not_on_gui = true; - switch (splitType) - { - case 0: // A/B - not_null(plugin.getControl("select")).not_on_gui = false; - not_null(plugin.getControl("mix")).not_on_gui = true; - not_null(plugin.getControl("volL")).not_on_gui = true; - not_null(plugin.getControl("panL")).not_on_gui = true; - not_null(plugin.getControl("volR")).not_on_gui = true; - not_null(plugin.getControl("panR")).not_on_gui = true; - break; - case 1: //mixer - not_null(plugin.getControl("select")).not_on_gui = true; - not_null(plugin.getControl("mix")).not_on_gui = false; - not_null(plugin.getControl("volL")).not_on_gui = true; - not_null(plugin.getControl("panL")).not_on_gui = true; - not_null(plugin.getControl("volR")).not_on_gui = true; - not_null(plugin.getControl("panR")).not_on_gui = true; - break; - case 2: // L/R - not_null(plugin.getControl("select")).not_on_gui = true; - not_null(plugin.getControl("mix")).not_on_gui = true; - not_null(plugin.getControl("volL")).not_on_gui = false; - not_null(plugin.getControl("panL")).not_on_gui = false; - not_null(plugin.getControl("volR")).not_on_gui = false; - not_null(plugin.getControl("panR")).not_on_gui = false; - break; + switch (splitType) { + case 0: // A/B + not_null(plugin.getControl("select")).not_on_gui = false; + not_null(plugin.getControl("mix")).not_on_gui = true; + not_null(plugin.getControl("volL")).not_on_gui = true; + not_null(plugin.getControl("panL")).not_on_gui = true; + not_null(plugin.getControl("volR")).not_on_gui = true; + not_null(plugin.getControl("panR")).not_on_gui = true; + break; + case 1: //mixer + not_null(plugin.getControl("select")).not_on_gui = true; + not_null(plugin.getControl("mix")).not_on_gui = false; + not_null(plugin.getControl("volL")).not_on_gui = true; + not_null(plugin.getControl("panL")).not_on_gui = true; + not_null(plugin.getControl("volR")).not_on_gui = true; + not_null(plugin.getControl("panR")).not_on_gui = true; + break; + case 2: // L/R + not_null(plugin.getControl("select")).not_on_gui = true; + not_null(plugin.getControl("mix")).not_on_gui = true; + not_null(plugin.getControl("volL")).not_on_gui = false; + not_null(plugin.getControl("panL")).not_on_gui = false; + not_null(plugin.getControl("volR")).not_on_gui = false; + not_null(plugin.getControl("panR")).not_on_gui = false; + break; } // xxx } if (plugin) { result.push( - + {plugin.name} @@ -243,10 +245,9 @@ export const MidiBindingDialog = ); - if (!isSplit) - { + if (!isSplit) { result.push( - + Bypass @@ -256,8 +257,7 @@ export const MidiBindingDialog = { - if (instanceId === -2) - { + if (instanceId === -2) { this.cancelListenForControl(); } else { this.handleListenForControl(instanceId, symbol, listenForControl); @@ -271,21 +271,35 @@ export const MidiBindingDialog = ); } + let lastPortGroup: PortGroup | null = null; for (let i = 0; i < plugin.controls.length; ++i) { let control = plugin.controls[i]; - if (control.isHidden()) - { + if (!control.is_input) { continue; } - if (!control.is_input) - { - continue; + let portGroup = plugin.getPortGroupBySymbol(control.port_group); + if (portGroup != lastPortGroup) { + lastPortGroup = portGroup; + if (portGroup != null) { + result.push( + + +
+ + {portGroup?.name} + +
+ + + ); + } } + let symbol = control.symbol; result.push( - + - + {control.name} @@ -319,66 +333,66 @@ export const MidiBindingDialog = render() { let props = this.props; - let { open} = props; + let { open } = props; const classes = withStyles.getClasses(props); if (!open) { return (
); } return ( - {}} + { }} > -
-
- - - - - - - Preset MIDI Bindings - - - -
-
- - - - - - - - {this.generateTable()} - - -
-
+
+
+ + + + + + + Preset MIDI Bindings + + +
- this.setState({ listenSnackbarOpen: false })} - message="Listening for MIDI input" - /> +
+ + + + + + + + {this.generateTable()} + + +
+
+
+ this.setState({ listenSnackbarOpen: false })} + message="Listening for MIDI input" + /> ); } }, - styles); + styles); export default MidiBindingDialog; \ No newline at end of file diff --git a/vite/src/pipedal/PiPedalModel.tsx b/vite/src/pipedal/PiPedalModel.tsx index b791956..5c1acd1 100644 --- a/vite/src/pipedal/PiPedalModel.tsx +++ b/vite/src/pipedal/PiPedalModel.tsx @@ -2297,12 +2297,12 @@ export class PiPedalModel //implements PiPedalModel private monitorPatchPropertyListeners: PatchPropertyListenerItem[] = []; nextListenHandle = 1; - listenForMidiEvent(listenForControlsOnly: boolean, onComplete: (isNote: boolean, noteOrControl: number) => void): ListenHandle { + listenForMidiEvent(listenForControl: boolean, onComplete: (isNote: boolean, noteOrControl: number) => void): ListenHandle { let handle = this.nextListenHandle++; this.midiListeners.push(new MidiEventListener(handle, onComplete)); - this.webSocket?.send("listenForMidiEvent", { listenForControlsOnly: listenForControlsOnly, handle: handle }); + this.webSocket?.send("listenForMidiEvent", { listenForControls: listenForControl, handle: handle }); return { _handle: handle }; @@ -2388,6 +2388,16 @@ export class PiPedalModel //implements PiPedalModel this.webSocket?.send("cancelListenForMidiEvent", listenHandle._handle); } + downloadAudioFile(filePath: string) { + let downloadUrl = this.varServerUrl + "downloadMediaFile?path=" + encodeURIComponent(filePath); + + // download with no flashing temporary tab. + let link = window.document.createElement("A") as HTMLLinkElement; + link.href = downloadUrl; + link.setAttribute("download", ""); + link.click(); + } + download(targetType: string, instanceId: number | string): void { if (instanceId === -1) return; let url = this.varServerUrl + targetType + "?id=" + instanceId; diff --git a/vite/src/pipedal/PluginControl.tsx b/vite/src/pipedal/PluginControl.tsx index d421348..4bf8acf 100644 --- a/vite/src/pipedal/PluginControl.tsx +++ b/vite/src/pipedal/PluginControl.tsx @@ -21,8 +21,8 @@ import React, { TouchEvent, PointerEvent, ReactNode, Component, SyntheticEvent } import { css } from '@emotion/react'; import Button from '@mui/material/Button'; import { Theme } from '@mui/material/styles'; -import WithStyles, {withTheme} from './WithStyles'; -import {createStyles} from './WithStyles'; +import WithStyles, { withTheme } from './WithStyles'; +import { createStyles } from './WithStyles'; import { withStyles } from "tss-react/mui"; import { UiControl, ScalePoint } from './Lv2Plugin'; @@ -37,11 +37,17 @@ import DialIcon from './svg/fx_dial.svg?react'; import { isDarkMode } from './DarkMode'; import ControlTooltip from './ControlTooltip'; +import PlayArrowIcon from '@mui/icons-material/PlayArrow'; +import StopIcon from '@mui/icons-material/Stop'; +import FiberManualRecordIcon from '@mui/icons-material/FiberManualRecord'; + const MIN_ANGLE = -135; const MAX_ANGLE = 135; const FONT_SIZE = "0.8em"; +enum ButtonStyle { None, Trigger, Momentary, MomentaryOnByDefault } + const SELECTED_OPACITY = 0.8; const DEFAULT_OPACITY = 0.6; @@ -53,6 +59,20 @@ const ULTRA_FINE_RANGE_SCALE = RANGE_SCALE * 50; // 12000 pixels to move from 0 export const StandardItemSize = { width: 80, height: 140 } +function androidEmoji(text: string) { + // android chrome doesn't support these characters properly. + if (text === "⏹") { + return (); + } + if (text === "⏺") { + return () + } + if (text === "⏵") + { + return (); + } + return text; +} export const pluginControlStyles = (theme: Theme) => createStyles({ frame: css({ @@ -115,12 +135,12 @@ const PluginControl = withTheme(withStyles( class extends Component { - frameRef: React.RefObject; - imgRef: React.RefObject; - inputRef: React.RefObject; - selectRef: React.RefObject; + frameRef: React.RefObject; + imgRef: React.RefObject; + inputRef: React.RefObject; + selectRef: React.RefObject; - displayValueRef: React.RefObject; + displayValueRef: React.RefObject; model: PiPedalModel; @@ -498,19 +518,50 @@ const PluginControl = this.isTap = false; } } + } - handleTriggerMouseDown() { + handleButtonMouseLeave(buttonStyle: ButtonStyle) { + } + handleButtonMouseDown(buttonStyle: ButtonStyle) { let uiControl = this.props.uiControl; if (uiControl) { - let value = uiControl.max_value; - if (uiControl.max_value === uiControl.default_value) { - value = uiControl.min_value; + switch (buttonStyle) { + case ButtonStyle.Momentary: + this.model.setPedalboardControl(this.props.instanceId, uiControl.symbol,uiControl.max_value); + break; + case ButtonStyle.MomentaryOnByDefault: + this.model.setPedalboardControl(this.props.instanceId, uiControl.symbol,uiControl.min_value); + break; + case ButtonStyle.Trigger: + { + let value = uiControl.max_value; + if (uiControl.max_value === uiControl.default_value) { + value = uiControl.min_value; + } + this.model.sendPedalboardControlTrigger(this.props.instanceId, uiControl.symbol, value); + + } + break; } - this.model.sendPedalboardControlTrigger(this.props.instanceId, uiControl.symbol, value); } } - handleTriggerMouseUp() { - // triggers are reset on the audio thread. + handleButtonMouseUp(buttonStyle: ButtonStyle) { + let uiControl = this.props.uiControl; + if (uiControl) { + switch (buttonStyle) { + case ButtonStyle.Momentary: + this.model.setPedalboardControl(this.props.instanceId, uiControl.symbol,uiControl.min_value); + break; + case ButtonStyle.MomentaryOnByDefault: + this.model.setPedalboardControl(this.props.instanceId, uiControl.symbol,uiControl.max_value); + break; + case ButtonStyle.Trigger: + { + // trigger values are reset automatically. + } + break; + } + } } previewInputValue(value: number, commitValue: boolean) { let range = this.valueToRange(value); @@ -657,8 +708,7 @@ const PluginControl = } range = Math.log(value / minValue) / Math.log(uiControl.max_value / minValue); if (!isFinite(range)) { - if (range < 0) - { + if (range < 0) { range = 0; } else { range = 1.0; @@ -672,8 +722,7 @@ const PluginControl = } else { range = (value - uiControl.min_value) / (uiControl.max_value - uiControl.min_value); if (!isFinite(range)) { - if (range < 0) - { + if (range < 0) { range = 0; } else { range = 1.0; @@ -760,14 +809,28 @@ const PluginControl = let isSelect = control.isSelect(); let isAbSwitch = control.isAbToggle(); let isOnOffSwitch = control.isOnOffSwitch(); - let isTrigger = control.isTrigger(); + + let isButton = false; + let buttonStyle: ButtonStyle = ButtonStyle.None; + if (control.isTrigger()) { + isButton = true; + buttonStyle = ButtonStyle.Trigger; + } + if (control.isMomentary()) { + isButton = true; + buttonStyle = ButtonStyle.Momentary; + } + if (control.isMomentaryOnByDefault()) { + isButton = true; + buttonStyle = ButtonStyle.MomentaryOnByDefault; + } if (isAbSwitch) { switchText = control.scale_points[0].value === value ? control.scale_points[0].label : control.scale_points[1].label; } let item_width: number | undefined = isSelect ? 160 : 80; - if (isTrigger) { + if (isButton) { item_width = undefined; } @@ -788,24 +851,38 @@ const PluginControl = {isTrigger ? "\u00A0" : control.name} + }}> {isButton ? "\u00A0" : control.name}
{/* CONTROL SECTION */}
- {isTrigger ? + {isButton ? ( control.name.length !== 1 ? ( ) ) @@ -865,7 +956,7 @@ const PluginControl = {/* LABEL/EDIT SECTION*/}
- {(!(isSelect || isOnOffSwitch || isTrigger)) && + {(!(isSelect || isOnOffSwitch || isButton)) && ( (isAbSwitch) ? ( createStyles({ paddingLeft: 30, paddingRight: 30, paddingTop: 8, + flex: "1 1 auto", display: "flex", flexDirection: "row", flexWrap: "wrap", justifyContent: "flex-start", alignItems: "flex_start", @@ -170,6 +171,7 @@ const styles = (theme: Theme) => createStyles({ // See the spacer div added after all controls in render() with provides the same effect. display: "flex", flexDirection: "row", flexWrap: "nowrap", justifyContent: "flex-start", alignItems: "flex-start", + overflowX: "hidden", overflowY: "hidden", flex: "0 0 auto", @@ -208,7 +210,7 @@ const styles = (theme: Theme) => createStyles({ marginBottom: 12, position: "relative", paddingLeft: 3, - paddingRight: 0, + paddingRight: 8, paddingTop: 0, paddingBottom: 0, border: "2pt #AAA solid", @@ -216,6 +218,7 @@ const styles = (theme: Theme) => createStyles({ elevation: 12, display: "flex", flexDirection: "row", flexWrap: "wrap", + flex: "0 1 auto", }), portGroupLandscape: css({ @@ -226,6 +229,7 @@ const styles = (theme: Theme) => createStyles({ position: "relative", paddingLeft: 0, paddingRight: 0, + paddingTop: 0, paddingBottom: 0, border: "2pt #AAA solid", @@ -253,6 +257,7 @@ const styles = (theme: Theme) => createStyles({ display: "flex", flexDirection: "row", flexWrap: "wrap", paddingTop: 6, + rowGap: 16, paddingBottom: 8 }), portGroupControlsLandscape: css({ @@ -260,6 +265,7 @@ const styles = (theme: Theme) => createStyles({ flexFlow: "row nowrap", width: "fit-content", paddingTop: 6, + rowGap: 16, paddingBottom: 8 }) @@ -779,6 +785,20 @@ const PluginControlView = onCancel={() => { this.setState({ showFileDialog: false }); }} + onApply={(fileProperty,selectedFile) => { + this.model.setPatchProperty( + this.props.instanceId, + fileProperty.patchProperty, + JsonAtom.Path(selectedFile) + ) + .then(() => { + + }) + .catch((error) => { + this.model.showAlert("Unable to complete the operation. " + error); + }); + + }} onOk={(fileProperty, selectedFile) => { this.model.setPatchProperty( @@ -790,7 +810,7 @@ const PluginControlView = }) .catch((error) => { - this.model.showAlert("Unable to complete the operation. Audio is not running." + error); + this.model.showAlert("Unable to complete the operation. " + error); }); this.setState({ showFileDialog: false }); } diff --git a/vite/src/pipedal/PluginInfoDialog.tsx b/vite/src/pipedal/PluginInfoDialog.tsx index ce184d9..6a37c86 100644 --- a/vite/src/pipedal/PluginInfoDialog.tsx +++ b/vite/src/pipedal/PluginInfoDialog.tsx @@ -20,8 +20,7 @@ import React from 'react'; import { Theme } from '@mui/material/styles'; import WithStyles from './WithStyles'; -import {createStyles} from './WithStyles'; - +import { createStyles } from './WithStyles'; import { withStyles } from "tss-react/mui"; import Button from '@mui/material/Button'; import DialogEx from './DialogEx'; @@ -34,7 +33,7 @@ import Typography from '@mui/material/Typography'; import Grid from '@mui/material/Grid'; import { PiPedalModelFactory } from "./PiPedalModel"; import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'; -import { UiPlugin, UiControl } from './Lv2Plugin'; +import { UiPlugin, PortGroup } from './Lv2Plugin'; import PluginIcon from './PluginIcon'; import { Remark } from 'react-remark'; import { css } from '@emotion/react'; @@ -56,6 +55,9 @@ const styles = (theme: Theme) => { icon: { fill: theme.palette.text.primary, opacity: 0.6 + }, + controlHeader: { + borderBottom: "1px solid " + theme.palette.divider, } }); }; @@ -88,7 +90,7 @@ const PluginInfoDialogContent = withStyles( (theme: Theme) => ({ root: { padding: theme.spacing(2), - } + } }) ); @@ -146,7 +148,8 @@ function ioDescription(plugin: UiPlugin): string { // ); // } -function makeControls(controls: UiControl[]) { +function makeControls(plugin: UiPlugin, controlHeadeClass: string) { + let controls = plugin.controls; let hasComments = false; for (let i = 0; i < controls.length; ++i) { @@ -156,14 +159,32 @@ function makeControls(controls: UiControl[]) { } } hasComments = true; + let lastPortGroup: PortGroup | null = null; + if (hasComments) { let trs: React.ReactElement[] = []; for (let i = 0; i < controls.length; ++i) { let control = controls[i]; - if (!(control.not_on_gui) && control.is_input) + if (!(control.not_on_gui) && control.is_input) { + let portGroup = plugin.getPortGroupBySymbol(control.port_group); + if (portGroup !== lastPortGroup) { + if (portGroup !== null) + { + trs.push(( + + + + {portGroup?.name ?? ""} + + + + )); + } + lastPortGroup = portGroup; + } trs.push(( - + {control.name} @@ -175,14 +196,14 @@ function makeControls(controls: UiControl[]) { )); - + } } return ( - +
{ trs } -
+ ); } else { @@ -290,7 +311,7 @@ const PluginInfoDialog = withStyles((props: PluginInfoProps) => { Controls: { - makeControls(plugin.controls) + makeControls(plugin, classes.controlHeader) } {plugin.description.length > 0 && (
@@ -338,6 +359,6 @@ const PluginInfoDialog = withStyles((props: PluginInfoProps) => {
); }, -styles); + styles); export default PluginInfoDialog; diff --git a/vite/src/pipedal/PluginOutputControl.tsx b/vite/src/pipedal/PluginOutputControl.tsx index d4e8642..1ce066a 100644 --- a/vite/src/pipedal/PluginOutputControl.tsx +++ b/vite/src/pipedal/PluginOutputControl.tsx @@ -130,6 +130,7 @@ const PluginOutputControl = private model: PiPedalModel; private vuRef: React.RefObject; + private progressRef: React.RefObject; private dbVuRef: React.RefObject; private dbVuTelltaleRef: React.RefObject; private lampRef: React.RefObject; @@ -138,6 +139,7 @@ const PluginOutputControl = constructor(props: PluginOutputControlProps) { super(props); this.vuRef = React.createRef(); + this.progressRef = React.createRef(); this.dbVuRef = React.createRef(); this.dbVuTelltaleRef = React.createRef(); this.lampRef = React.createRef(); @@ -182,6 +184,7 @@ const PluginOutputControl = } } + private PROGRESS_WIDTH = 40-4; private VU_HEIGHT = 60 - 4; private DB_VU_HEIGHT = 60 - 4; private animationHandle: number | undefined = undefined; @@ -257,7 +260,23 @@ const PluginOutputControl = } else if (this.dbVuRef.current) { this.dbVuValue = value; this.requestDbVuAnimation(); - } + } else if (this.progressRef.current) { + let control = this.props.uiControl; + let range = (value - control.min_value) / (control.max_value - control.min_value); + let w = this.PROGRESS_WIDTH * range; + + if (!this.animationHandle) { + this.animationHandle = requestAnimationFrame( + () => { + if (this.progressRef.current) { + this.progressRef.current.style.width = w + "px"; + } + this.animationHandle = undefined; + } + ) + } + + } else if (this.vuRef.current) { let control = this.props.uiControl; let range = (value - control.min_value) / (control.max_value - control.min_value); @@ -364,6 +383,43 @@ const PluginOutputControl =
); + } else if (control.isProgress()) { + item_width = undefined; + return ( +
+ {/* TITLE SECTION */} +
+ + {control.name === "" ? "\u00A0" : control.name} + +
+ {/* CONTROL SECTION */} + +
+
+
+
+
+
+
+ +
+
+ +
+ +
+ + ); } else if (control.isDbVu()) { item_width = undefined; @@ -407,7 +463,6 @@ const PluginOutputControl = ); } else if (control.isVu()) { - // yyx: convert this to a horizontal progress bar. item_width = undefined; return (