{controlGroup.name !== "" && (
@@ -711,6 +784,11 @@ const PluginControlView =
);
}
}
+ if (plugin.audio_side_chain_inputs !== 0) {
+
+ result.push(this.makeSideChainSelect(plugin));
+
+ }
return result;
}
@@ -803,6 +881,9 @@ const PluginControlView =
return false;
}
+ handleSelectSidechainInput() {
+ this.setState({sidechainDialogOpen: true});
+ }
handleModGuiFileProperty(instanceId: number, filePropertyUri: string, selectedFile: string) {
let plugin = this.model.getUiPlugin(this.props.item.uri);
@@ -827,10 +908,30 @@ const PluginControlView =
if (!uiPlugin) {
return (
);
}
+ let toolBarChildren: ReactNode[] = [];
+ if (uiPlugin.audio_side_chain_inputs > 0) {
+ toolBarChildren.push(
+
{
+ this.handleSelectSidechainInput();
+ }}
+ >
+
+
+ );
+ }
return (
{ this.setState({ showModGuiZoomed: value }); }
}
@@ -1012,6 +1113,16 @@ const PluginControlView =
}
/>
)}
+ {this.state.sidechainDialogOpen && (
+ { this.setState({sidechainDialogOpen: false});}}
+ selectItems={this.getSidechainSelectItems()}
+ selectedInstanceId={this.props.item.sideChainInputId}
+ onChanged={(instanceId: number) => {
+ this.model.setPedalboardSideChainInput(this.props.item.instanceId, instanceId);
+ }}
+ />
+ )}
{/* xxx: I don't think we need this anyore. */}
c.minDb && levelDb <= c.maxDb) {
ix = i;
@@ -122,18 +121,18 @@ const styles = (theme: Theme) => createStyles({
}),
titleSection: css({
- flex: "0 0 auto", alignSelf:"stretch", marginBottom: 8, marginLeft: 0, marginRight: 0
+ flex: "0 0 auto", alignSelf: "stretch", marginBottom: 8, marginLeft: 0, marginRight: 0
}),
midSection: css({
- flex: "1 1 1", display: "flex",flexFlow: "column nowrap",alignContent: "center",justifyContent: "center"
+ flex: "1 1 1", display: "flex", flexFlow: "column nowrap", alignContent: "center", justifyContent: "center"
}),
editSection: css({
flex: "0 0 28", position: "relative", width: 60, height: 28, minHeight: 28
}),
editSectionNoContent: css({
- flex: "0 0 28", position: "relative", width: 1, height: 28, minHeight: 28
+ flex: "0 0 28", position: "relative", width: 1, height: 28, minHeight: 28
})
});
@@ -153,12 +152,12 @@ const PluginOutputControl =
class extends Component {
private model: PiPedalModel;
- private vuRef: React.RefObject;
- private progressRef: React.RefObject;
- private dbVuRef: React.RefObject;
- private dbVuTelltaleRef: React.RefObject;
- private dbVuTextRef: React.RefObject;
- private lampRef: React.RefObject;
+ private vuRef: React.RefObject;
+ private progressRef: React.RefObject;
+ private dbVuRef: React.RefObject;
+ private dbVuTelltaleRef: React.RefObject;
+ private dbVuTextRef: React.RefObject;
+ private lampRef: React.RefObject;
constructor(props: PluginOutputControlProps) {
@@ -210,7 +209,7 @@ const PluginOutputControl =
}
}
- private PROGRESS_WIDTH = 40-4;
+ private PROGRESS_WIDTH = 40 - 4;
private VU_HEIGHT = 60 - 4;
private DB_VU_HEIGHT = 60 - 4;
private animationHandle: number | undefined = undefined;
@@ -240,26 +239,23 @@ const PluginOutputControl =
}
if (this.dbVuTextRef.current) {
let text: string;
- if (this.dbVuTelltale <= this.props.uiControl.min_value)
- {
+ if (this.dbVuTelltale <= this.props.uiControl.min_value) {
text = "-";
} else {
- if (Math.abs(this.dbVuTelltale) >= 99.5)
- {
+ if (Math.abs(this.dbVuTelltale) >= 99.5) {
text = Math.round(this.dbVuTelltale).toString();
} else {
text = this.dbVuTelltale.toFixed(1);
}
if (!text.startsWith("-")) {
- text = '+'+text;
- }
+ text = '+' + text;
+ }
}
- if (this.lastDbText !== text)
- {
+ if (this.lastDbText !== text) {
this.lastDbText = text;
this.dbVuTextRef.current.innerText = text;
}
- }
+ }
this.animationHandle = undefined;
this.updateDbVuTelltale();
}
@@ -322,7 +318,7 @@ const PluginOutputControl =
)
}
- }
+ }
else if (this.vuRef.current) {
let control = this.props.uiControl;
let range = (value - control.min_value) / (control.max_value - control.min_value);
@@ -389,8 +385,7 @@ const PluginOutputControl =
if (value > control.max_value) {
value = control.max_value;
}
- if (value < control.min_value)
- {
+ if (value < control.min_value) {
value = control.min_value;
}
let y = (control.max_value - value) * this.DB_VU_HEIGHT / (control.max_value - control.min_value);
@@ -439,13 +434,13 @@ const PluginOutputControl =
} else if (control.isProgress()) {
item_width = undefined;
return (
-
{/* TITLE SECTION */}
-
+
- {control.name === "" ? "\u00A0" : control.name}
@@ -453,15 +448,18 @@ const PluginOutputControl =
{/* CONTROL SECTION */}
-
-
-
-
-
@@ -478,45 +476,48 @@ const PluginOutputControl =
let vuColors = defaultVuColors;
return (
-
{/* TITLE SECTION */}
-
-
- {control.name === "" ? "\u00A0" : control.name}
-
+
+ {control.name === "" ? "\u00A0" : control.name}
{/* CONTROL SECTION */}
-
-
-
-
- {
- vuColors.map((vuColor,ix)=>{
- let top = Math.floor(this.dbVuMap(vuColor.maxDb));
- let bottom = Math.ceil(this.dbVuMap(vuColor.minDb))+1;
+
- return (
-
- );
- })
- }
+
+
+
+ {
+ vuColors.map((vuColor, ix) => {
+ let top = Math.floor(this.dbVuMap(vuColor.maxDb));
+ let bottom = Math.ceil(this.dbVuMap(vuColor.minDb)) + 1;
+
+ return (
+
+ );
+ })
+ }
+
+
+
+
-
-
-
+
@@ -533,26 +534,28 @@ const PluginOutputControl =
else if (control.isVu()) {
item_width = undefined;
return (
-
+
{/* TITLE SECTION */}
-
-
- {control.name === "" ? "\u00A0" : control.name}
-
+
+ {control.name === "" ? "\u00A0" : control.name}
+
{/* CONTROL SECTION */}
-
-
-
+ style={{ display: "flex", justifyContent: "center", alignItems: "start", flexFlow: "row nowrap" }}>
+
+
-
+
@@ -575,11 +578,11 @@ const PluginOutputControl =
}
return (
+ style={{ width: attachedLamp ? 15 : item_width }}
+ >
{/* TITLE SECTION */}
-
+
{/* CONTROL SECTION */}
-
@@ -613,23 +616,23 @@ const PluginOutputControl =
);
} if (control.isOutputText()) {
return (
-
+
{/* TITLE SECTION */}
-
{control.name === "" ? "\u00A0": control.name}
+ }}> {control.name === "" ? "\u00A0" : control.name}
{/* CONTROL SECTION */}
@@ -646,10 +649,10 @@ const PluginOutputControl =
} else {
return (
-
+
{/* TITLE SECTION */}
-
{/* CONTROL SECTION */}
-
{text}
diff --git a/vite/src/pipedal/SideChainSelectControl.tsx b/vite/src/pipedal/SideChainSelectControl.tsx
new file mode 100644
index 0000000..f4f3177
--- /dev/null
+++ b/vite/src/pipedal/SideChainSelectControl.tsx
@@ -0,0 +1,223 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) Robin E. R. Davies
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import { Component } from 'react';
+import { Theme } from '@mui/material/styles';
+import { css } from '@emotion/react';
+
+import DialogEx from './DialogEx';
+import DialogTitle from '@mui/material/DialogTitle';
+import ArrowBackIcon from '@mui/icons-material/ArrowBack';
+import Toolbar from '@mui/material/Toolbar';
+import DialogContent from '@mui/material/DialogContent';
+import IconButtonEx from './IconButtonEx';
+import Typography from '@mui/material/Typography';
+import { PiPedalModel, PiPedalModelFactory, State } from './PiPedalModel';
+import Select from '@mui/material/Select';
+import MenuItem from '@mui/material/MenuItem';
+
+
+export const StandardItemSize = { width: 80, height: 140 }
+
+
+import { withStyles } from "tss-react/mui";
+import WithStyles from './WithStyles';
+import { withTheme } from './WithStyles';
+
+const styles = (theme: Theme) => {
+ return {
+ frame: css({
+ position: "relative",
+ margin: "12px"
+ }),
+ controlFrame: css({
+ display: "flex", flexDirection: "column", alignItems: "start", justifyContent: "space-between", height: 116
+ }),
+ displayValue: css({
+ position: "absolute",
+ top: 0,
+ left: 0,
+ right: 0,
+ bottom: 4,
+ textAlign: "center",
+ background: theme.mainBackground,
+ color: theme.palette.text.secondary,
+ // zIndex: -1,
+ }),
+ titleSection: css({
+ flex: "0 0 auto", alignSelf: "stretch", marginBottom: 8, marginLeft: 8, marginRight: 0
+ }),
+ midSection: css({
+ flex: "1 1 1", display: "flex", flexFlow: "column nowrap", alignContent: "center", justifyContent: "center"
+ }),
+ editSection: css({
+ flex: "0 0 0", position: "relative", width: 60, height: 28, minHeight: 28
+ })
+ }
+}
+ ;
+
+
+export interface SideChainSelectControlProps extends WithStyles {
+ title: string;
+ selectItems: { instanceId: number, title: string }[];
+ selectedInstanceId: number;
+ onChanged(instanceId: number): void;
+ theme: Theme;
+}
+type SideChainSelectControlState = {
+};
+
+const SideChainSelectControl =
+ withTheme(withStyles(
+ class extends Component {
+
+ model: PiPedalModel;
+
+
+ constructor(props: SideChainSelectControlProps) {
+ super(props);
+
+ this.state = {
+ };
+ this.model = PiPedalModelFactory.getInstance();
+ this.onStateChanged = this.onStateChanged.bind(this);
+ }
+
+
+ onStateChanged(state: State) {
+ }
+ mounted: boolean = false;
+ componentDidMount() {
+ this.model.state.addOnChangedHandler(this.onStateChanged);
+ this.mounted = true;
+ }
+ componentWillUnmount() {
+ this.mounted = false;
+ this.model.state.removeOnChangedHandler(this.onStateChanged);
+ }
+ componentDidUpdate(prevProps: Readonly, prevState: Readonly, snapshot?: any): void {
+ }
+
+ render() {
+ //const classes = withStyles.getClasses(this.props);
+
+ const classes = withStyles.getClasses(this.props);
+
+ return (
+
+ {/* TITLE SECTION */}
+
+ {this.props.title}
+
+ {/* CONTROL SECTION */}
+
+
+
+
+
+
+ {/* LABEL/EDIT SECTION*/}
+
+
+
-Download: v1.5.93
+Download: v1.5.94
Website: [https://rerdavies.github.io/pipedal](https://rerdavies.github.io/pipedal).
Documentation: [https://rerdavies.github.io/pipedal/Documentation.html](https://rerdavies.github.io/pipedal/Documentation.html).
-#### NEW version 1.5.93 Release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details. TooB NAM calibration, manipulation of i/r files in Toob Convolution Reverb, new Parametric EQ and 3 Band EQ plugins, and MORE!
+#### NEW version 1.5.94 Release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details. TooB NAM calibration, manipulation of i/r files in Toob Convolution Reverb, new Parametric EQ and 3 Band EQ plugins, and MORE!
diff --git a/docs/Installing.md b/docs/Installing.md
index 25bd308..ce9e32b 100644
--- a/docs/Installing.md
+++ b/docs/Installing.md
@@ -13,18 +13,18 @@ page_icon: img/Install4.jpg
Download the most recent Debian (.deb) package for your platform:
-- [Raspberry Pi OS bookworm (aarch64) v1.5.93](https://github.com/rerdavies/pipedal/releases/download/v1.5.93/pipedal_1.5.93_arm64.deb)
-- [Ubuntu 24.04 through 25.04 (aarch64) v1.5.93](https://github.com/rerdavies/pipedal/releases/download/v1.5.93/pipedal_1.5.93_arm64.deb)
-- [Ubuntu 24.04 through 25.04 (amd64) v1.5.93](https://github.com/rerdavies/pipedal/releases/download/v1.5.93/pipedal_1.5.93_amd64.deb)
+- [Raspberry Pi OS bookworm (aarch64) v1.5.94](https://github.com/rerdavies/pipedal/releases/download/v1.5.94/pipedal_1.5.94_arm64.deb)
+- [Ubuntu 24.04 through 25.04 (aarch64) v1.5.94](https://github.com/rerdavies/pipedal/releases/download/v1.5.94/pipedal_1.5.94_arm64.deb)
+- [Ubuntu 24.04 through 25.04 (amd64) v1.5.94](https://github.com/rerdavies/pipedal/releases/download/v1.5.94/pipedal_1.5.94_amd64.deb)
-Version 1.5.93 has been tested on Raspberry Pi OS bookworm, Ubuntu 24.04 (amd64), Ubuntu 24.10 (aarch64), and Ubuntu 25.04 (aarch64). Download the appropriate package for your platform, and install using the following procedure:
+Version 1.5.94 has been tested on Raspberry Pi OS bookworm, Ubuntu 24.04 (amd64), Ubuntu 24.10 (aarch64), and Ubuntu 25.04 (aarch64). Download the appropriate package for your platform, and install using the following procedure:
```
sudo apt update
sudo apt upgrade
cd ~/Downloads
- sudo apt-get install ./pipedal_1.5.93_arm64.deb
+ sudo apt-get install ./pipedal_1.5.94_arm64.deb
```
You MUST use `apt-get`. `apt` will not install downloaded packages; and `dpkg -i` will not install dependencies.
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index cc7141c..389e425 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,16 @@
# Release Notes
+## PiPedal 1.5.94 Beta
+
+A minor release that allows use of plugins with audio sidechains.
+
+### Features in this release
+
+- **Sidechains**. You can now load plugins that have sidechain inputs. This allows you to use compressor and gate plugins, particularly, that often have sidechains, but also enables a broad class of dynamics processing plugins that would not be loadable in previous versions of PiPedal. Plugins that have sidechain inputs will show a dropdown control in their control view which allows you to select the source of the sidechain input. The source plugin for the sidechain must appear earlier in the signal chain.
+
+ Although sidechain processing is occasionally useful in guitar effect pedalboards, the more important part of this feature is that it allows you to load plugins that were rejected by previous versions of PiPedal because they had optional sidechain inputs.
+
+
## PiPedal 1.5.93 Release
### Major Features in This Build
diff --git a/docs/UsingLv2Plugins.md b/docs/UsingLv2Plugins.md
index c6f89a8..1e8f0ac 100644
--- a/docs/UsingLv2Plugins.md
+++ b/docs/UsingLv2Plugins.md
@@ -17,7 +17,7 @@ Here is a brief list of other particularly recommended plugin collections.
| Collection | To Install | Description |
|---------------------------------|---------------------------------------|------------------|
| [Guitarix](https://guitarix.org) ★★★☆☆ | `sudo apt install guitarix-lv2` | A large collection of guitar amplifiers and effects. Prior to the advent of neural network amplifier emulations, Guitarix was the go-to source for open-source amp modeling.|
-| [GxPlugins](https://github.com/brummer10/GxPlugins.lv2) ★★★★★ | `sudo apt install gxplugins` | Additional amps and effects from the the principle developer of Guitarix, many of which are significantly superior to the original Guitarix plugins. Most of these plugins
+| [GxPlugins](https://github.com/brummer10/GxPlugins.lv2) ★★★★★ | On Raspberry Pi Os: `sudo apt install gxplugins`, on amd64/x64 donwload from [Github](https://github.com/brummer10/GxPlugins.lv2/releases) | Additional amps and effects from the the principle developer of Guitarix, many of which are significantly superior to the original Guitarix plugins. Most of these plugins
use circuit simulation to directly model actual original circuits. The results are uniformly excellent.|
| [DPF Plugins](https://github.com/DISTRHO/DPF-Plugins) ★★★★★ | `sudo apt install dpf-plugins-lv2` | Useful and interesting guitar effect plugins. Bit crusher, pitch shift, reverbs, 3-band EQ and more. |
| [MDA Plugins](http://drobilla.net/software/mda-lv2.html) ★★★★☆ | `sudo apt install mda-lv2` | 36 high-quality plugs |
diff --git a/docs/download.md b/docs/download.md
index c54df26..e3fdef9 100644
--- a/docs/download.md
+++ b/docs/download.md
@@ -4,9 +4,9 @@
Download the most recent Debian (.deb) package for your platform:
-- [Raspberry Pi OS bookworm (aarch64) v1.5.93 Beta](https://github.com/rerdavies/pipedal/releases/download/v1.5.93/pipedal_1.5.93_arm64.deb)
-- [Ubuntu 24.x, 25.04 (aarch64) v1.5.93 Alpha](https://github.com/rerdavies/pipedal/releases/download/v1.5.93/pipedal_1.5.93_arm64.deb)
-- [Ubuntu 24.x, 25.04 (amd64) v1.5.93 Alpha](https://github.com/rerdavies/pipedal/releases/download/v1.5.93/pipedal_1.5.93_amd64.deb)
+- [Raspberry Pi OS bookworm (aarch64) v1.5.94 Beta](https://github.com/rerdavies/pipedal/releases/download/v1.5.94/pipedal_1.5.94_arm64.deb)
+- [Ubuntu 24.x, 25.04 (aarch64) v1.5.94 Alpha](https://github.com/rerdavies/pipedal/releases/download/v1.5.94/pipedal_1.5.94_arm64.deb)
+- [Ubuntu 24.x, 25.04 (amd64) v1.5.94 Alpha](https://github.com/rerdavies/pipedal/releases/download/v1.5.94/pipedal_1.5.94_amd64.deb)
Install the package by running
@@ -14,7 +14,7 @@ Install the package by running
```
sudo apt update
cd ~/Downloads
- sudo apt-get install ./pipedal_1.5.93_arm64.deb
+ sudo apt-get install ./pipedal_1.5.94_arm64.deb
```
You MUST use `apt-get` to install the package. `apt install` will NOT install the package correctly. The message about missing permissions given by `apt-get` is
expected, and can be safely ignored.
diff --git a/modules/libzip b/modules/libzip
index 9203514..fb59b49 160000
--- a/modules/libzip
+++ b/modules/libzip
@@ -1 +1 @@
-Subproject commit 92035140dfd80f4d31dd33590acb018da21cdfb0
+Subproject commit fb59b49dff933d52e85b3a772b52bf004aa60fc8
diff --git a/src/IEffect.hpp b/src/IEffect.hpp
index b5a4ce7..beec4ee 100644
--- a/src/IEffect.hpp
+++ b/src/IEffect.hpp
@@ -54,7 +54,9 @@ namespace pipedal {
virtual int GetNumberOfInputAudioBuffers() const = 0; // may be different if plugin has zero inputs.
virtual int GetNumberOfOutputAudioBuffers() const = 0; // may be different if plugin has zero inputs.
+ virtual int GetNumberOfSidechainAudioBuffers() const { return 0; }
virtual float *GetAudioInputBuffer(int index) const = 0;
+ virtual float *GetAudioSidechainBuffer(int index) const { throw std::runtime_error("Not implemented"); }
virtual float *GetAudioOutputBuffer(int index) const = 0;
virtual void ResetAtomBuffers() = 0;
@@ -65,6 +67,7 @@ namespace pipedal {
virtual void SetAudioInputBuffer(int index, float *buffer) = 0;
virtual void SetAudioOutputBuffer(int index, float*buffer) = 0;
+ virtual void SetAudioSidechainBuffer(int index, float *buffer) { throw std::runtime_error("Not implemented");}
virtual void Activate() = 0;
diff --git a/src/Lv2Effect.cpp b/src/Lv2Effect.cpp
index fd339b0..4551259 100644
--- a/src/Lv2Effect.cpp
+++ b/src/Lv2Effect.cpp
@@ -384,7 +384,12 @@ void Lv2Effect::PreparePortIndices()
{
if (port->is_input())
{
- this->inputAudioPortIndices.push_back(portIndex);
+ if (port->is_sidechain())
+ {
+ this->inputSidechainPortIndices.push_back(portIndex);
+ } else {
+ this->inputAudioPortIndices.push_back(portIndex);
+ }
}
else
{
@@ -432,6 +437,7 @@ void Lv2Effect::PreparePortIndices()
this->maxInputControlPort = maxInputControlPort;
inputAudioBuffers.resize(inputAudioPortIndices.size());
+ inputSidechainBuffers.resize(inputSidechainPortIndices.size());
outputAudioBuffers.resize(outputAudioPortIndices.size());
inputAtomBuffers.resize(inputAtomPortIndices.size());
outputAtomBuffers.resize(outputAtomPortIndices.size());
@@ -439,9 +445,7 @@ void Lv2Effect::PreparePortIndices()
if (RequiresBufferStaging())
{
EnableBufferStaging(
- GetStagedBufferSize(),
- this->GetNumberOfInputAudioBuffers(),
- this->GetNumberOfOutputAudioBuffers());
+ GetStagedBufferSize());
}
}
@@ -473,6 +477,7 @@ void Lv2Effect::PrepareNoInputEffect(int numberOfInputs, size_t maxBufferSize)
}
}
+
void Lv2Effect::SetAudioInputBuffer(int index, float *buffer)
{
this->inputAudioBuffers.at(index) = buffer;
@@ -512,6 +517,32 @@ void Lv2Effect::SetAudioInputBuffer(int index, float *buffer)
// }
}
}
+void Lv2Effect::SetAudioSidechainBuffer(int index, float *buffer)
+{
+ this->inputSidechainBuffers.at(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 (stagingBufferSize != 0)
+ {
+ int pluginIndex = this->inputSidechainPortIndices.at(index);
+ if (index >= sidechainStagingBufferPointers.size())
+ {
+ throw std::runtime_error("Invalid input staging buffer index.");
+ }
+ lilv_instance_connect_port(this->pInstance, pluginIndex, sidechainStagingBufferPointers.at(index));
+ }
+ else
+ {
+ int pluginIndex = this->inputSidechainPortIndices.at(index);
+ lilv_instance_connect_port(this->pInstance, pluginIndex, buffer);
+ }
+}
void Lv2Effect::SetAudioInputBuffer(float *left)
{
@@ -664,6 +695,14 @@ void Lv2Effect::UpdateAudioPorts()
lilv_instance_connect_port(pInstance, portIndex, outputStagingBufferPointers.at(i));
}
}
+ for (size_t i = 0; i < this->inputSidechainPortIndices.size(); ++i)
+ {
+ int portIndex = this->inputSidechainPortIndices.at(i);
+ if (sidechainStagingBufferPointers.at(i) != nullptr)
+ {
+ lilv_instance_connect_port(pInstance, portIndex, sidechainStagingBufferPointers.at(i));
+ }
+ }
for (size_t i = 0; i < this->inputAtomPortIndices.size(); ++i)
{
if (i == 0)
@@ -710,6 +749,15 @@ void Lv2Effect::UpdateAudioPorts()
lilv_instance_connect_port(pInstance, portIndex, GetAudioOutputBuffer(i));
}
}
+ for (size_t i = 0; i < this->inputSidechainPortIndices.size(); ++i)
+ {
+ int portIndex = this->inputSidechainPortIndices.at(i);
+ if (GetAudioSidechainBuffer(i) != nullptr)
+ {
+ lilv_instance_connect_port(pInstance, portIndex, GetAudioSidechainBuffer(i));
+ }
+ }
+
for (size_t i = 0; i < this->inputAtomPortIndices.size(); ++i)
{
auto atomInputBuffer = this->GetAtomInputBuffer(i);
@@ -877,6 +925,16 @@ size_t Lv2Effect::stageToInput(size_t inputSampleOffset, size_t samples)
pOutput[i] = pInput[i];
}
}
+ for (size_t nSidechain = 0; nSidechain < this->inputSidechainBuffers.size(); ++nSidechain)
+ {
+ float *restrict pInput = this->inputSidechainBuffers[nSidechain] + inputSampleOffset;
+ float *restrict pOutput = this->sidechainStagingBufferPointers.at(nSidechain) + this->stagingInputIx;
+ for (size_t i = 0; i < thisTime; ++i)
+ {
+ pOutput[i] = pInput[i];
+ }
+
+ }
this->stagingInputIx += thisTime;
inputSampleOffset += thisTime;
@@ -1487,8 +1545,11 @@ void Lv2Effect::SetPathPatchProperty(const std::string &propertyUri, const std::
mainThreadPathProperties[propertyUri] = jsonAtom;
}
-void Lv2Effect::EnableBufferStaging(size_t bufferSize, size_t nInputs, size_t nOutputs)
+void Lv2Effect::EnableBufferStaging(size_t bufferSize )
{
+ size_t nInputs = this->GetNumberOfInputAudioBuffers();
+ size_t nSidechainInputs = this->GetNumberOfSidechainAudioBuffers();
+ size_t nOutputs = this->GetNumberOfOutputAudioBuffers();
stagingBufferSize = bufferSize;
stagingOutputIx = bufferSize;
@@ -1520,6 +1581,12 @@ void Lv2Effect::EnableBufferStaging(size_t bufferSize, size_t nInputs, size_t nO
inputStagingBuffers[i][bufferSize] = 99.9f; // guard entry
inputStagingBufferPointers.at(i) = inputStagingBuffers.at(i).data();
}
+ for (size_t i = 0; i < nSidechainInputs; ++i)
+ {
+ sidechainStagingBuffers.at(i).resize(bufferSize + 1);
+ sidechainStagingBuffers[i][bufferSize] = 99.9f; // guard entry
+ sidechainStagingBufferPointers.at(i) = sidechainStagingBuffers.at(i).data();
+ }
for (size_t i = 0; i < nOutputs; ++i)
{
outputStagingBuffers.at(i).resize(bufferSize + 1);
@@ -1571,6 +1638,12 @@ float *Lv2Effect::GetAudioInputBuffer(int index) const
throw std::range_error("Lv2Effect::GetAudioInputBuffer");
return this->inputAudioBuffers.at(index);
}
+float *Lv2Effect::GetAudioSidechainBuffer(int index) const
+{
+ if (index < 0 || index >= this->inputSidechainBuffers.size())
+ throw std::range_error("Lv2Effect::GetAudioSidechainBuffer");
+ return this->inputSidechainBuffers.at(index);
+}
float *Lv2Effect::GetAudioOutputBuffer(int index) const
{
diff --git a/src/Lv2Effect.hpp b/src/Lv2Effect.hpp
index 4abba0d..76c577c 100644
--- a/src/Lv2Effect.hpp
+++ b/src/Lv2Effect.hpp
@@ -81,6 +81,8 @@ namespace pipedal
std::vector