{ e.preventDefault(); }}>
+ {hasMidiConnector && (
+
+
+
+
+ )}
{ this.onItemClick(e, instanceId); }}
@@ -941,10 +999,10 @@ const PedalboardView =
onContextMenu={(e: SyntheticEvent) => { this.onItemLongClick(e, instanceId); }}
>
- this.getScrollContainer()}
+ this.getScrollContainer()}
onDragEnd={(x, y) => { this.onDragEnd(instanceId, x, y) }}
>
-
+
@@ -975,16 +1033,16 @@ const PedalboardView =
let outputs: ReactNode[] = [];
this.renderConnectors(outputs, layoutChain, true, false);
return (
-
-
)
- let uiPlugin = this.model.getUiPlugin(item.pedalItem?.uri??"");
+ let uiPlugin = this.model.getUiPlugin(item.pedalItem?.uri ?? "");
let pluginMissing = uiPlugin == null;
+
result.push(
- {this.pedalButton(item.pedalItem?.instanceId ?? -1, item.pluginType, !item.isEmpty(), item.pedalItem?.isEnabled ?? false,true,pluginMissing)}
+ {this.pedalButton(
+ item.pedalItem?.instanceId ?? -1,
+ item.pluginType,
+ !item.isEmpty(),
+ item.pedalItem?.isEnabled ?? false,
+ true,
+ pluginMissing,
+ uiPlugin ? ((uiPlugin.has_midi_input !== 0) || (uiPlugin.has_midi_output !== 0)) : false)}
);
@@ -1090,51 +1156,43 @@ const PedalboardView =
this.markStereoBackward(layoutChain, numberOfOutputs);
}
- markStereoBackward(layoutChain: PedalLayout[], numberOfOutputs: number) : number
- {
- for (let i = layoutChain.length-1; i >= 0; --i)
- {
+ markStereoBackward(layoutChain: PedalLayout[], numberOfOutputs: number): number {
+ for (let i = layoutChain.length - 1; i >= 0; --i) {
let item = layoutChain[i];
- if (item.isSplitter())
- {
+ if (item.isSplitter()) {
item.numberOfOutputs = CalculateConnection(item.numberOfOutputs, numberOfOutputs)
- this.markStereoBackward(item.topChildren,numberOfOutputs);
- this.markStereoBackward(item.bottomChildren,numberOfOutputs);
+ this.markStereoBackward(item.topChildren, numberOfOutputs);
+ this.markStereoBackward(item.bottomChildren, numberOfOutputs);
let topInputs = item.topChildren[0].numberOfInputs;
let bottomInputs = item.bottomChildren[0].numberOfInputs;
let splitItem = item.pedalItem as PedalboardSplitItem;
- if (splitItem.getSplitType() !== SplitType.Lr)
- {
- item.numberOfInputs = CalculateConnection(item.numberOfInputs, Math.max(topInputs,bottomInputs));
+ if (splitItem.getSplitType() !== SplitType.Lr) {
+ item.numberOfInputs = CalculateConnection(item.numberOfInputs, Math.max(topInputs, bottomInputs));
}
- } else if (item.isEnd())
- {
+ } else if (item.isEnd()) {
- } else if (item.isStart())
- {
- item.numberOfOutputs = CalculateConnection(item.numberOfOutputs,numberOfOutputs);
+ } else if (item.isStart()) {
+ item.numberOfOutputs = CalculateConnection(item.numberOfOutputs, numberOfOutputs);
return item.numberOfOutputs;
} else if (item.isEmpty()) {
- if (numberOfOutputs === 0)
- {
+ if (numberOfOutputs === 0) {
item.numberOfOutputs = 0;
- item.numberOfInputs = CalculateConnection(item.numberOfInputs,2);
+ item.numberOfInputs = CalculateConnection(item.numberOfInputs, 2);
} else {
- item.numberOfOutputs = CalculateConnection(item.numberOfOutputs,numberOfOutputs);
- item.numberOfInputs = CalculateConnection(item.numberOfInputs,numberOfOutputs);
+ item.numberOfOutputs = CalculateConnection(item.numberOfOutputs, numberOfOutputs);
+ item.numberOfInputs = CalculateConnection(item.numberOfInputs, numberOfOutputs);
}
} else {
- item.numberOfOutputs = CalculateConnection(item.numberOfOutputs,numberOfOutputs);
+ item.numberOfOutputs = CalculateConnection(item.numberOfOutputs, numberOfOutputs);
}
numberOfOutputs = item.numberOfInputs;
}
return numberOfOutputs;
}
- markStereoForward(layoutChain: PedalLayout[],numberOfInputs: number): number
- {
+ markStereoForward(layoutChain: PedalLayout[], numberOfInputs: number): number {
if (layoutChain.length === 0) {
return numberOfInputs;
}
@@ -1145,9 +1203,8 @@ const PedalboardView =
item.numberOfInputs = numberOfInputs;
let chainInputs = numberOfInputs;
- if (splitter.getSplitType() === SplitType.Lr)
- {
- chainInputs = CalculateConnection(numberOfInputs,1);
+ if (splitter.getSplitType() === SplitType.Lr) {
+ chainInputs = CalculateConnection(numberOfInputs, 1);
}
let topOutputs = this.markStereoForward(item.topChildren, chainInputs);
let bottomOutputs = this.markStereoForward(item.bottomChildren, chainInputs);
@@ -1160,28 +1217,32 @@ const PedalboardView =
item.numberOfOutputs = bottomOutputs;
}
} else {
- item.numberOfOutputs = (topOutputs >= 1 || bottomOutputs >= 1) ? 2: 1;
- }
- } else if (item.isStart())
- {
- item.numberOfOutputs = Math.min(PiPedalModelFactory.getInstance().jackSettings.get().inputAudioPorts.length,2);
+ item.numberOfOutputs = (topOutputs >= 1 || bottomOutputs >= 1) ? 2 : 1;
+ }
+ } else if (item.isStart()) {
+ item.numberOfOutputs = Math.min(PiPedalModelFactory.getInstance().jackSettings.get().inputAudioPorts.length, 2);
} else if (item.isEnd()) {
- item.numberOfInputs =
+ item.numberOfInputs =
CalculateConnection(
- Math.min(PiPedalModelFactory.getInstance().jackSettings.get().outputAudioPorts.length,2),
+ Math.min(PiPedalModelFactory.getInstance().jackSettings.get().outputAudioPorts.length, 2),
numberOfInputs);
return item.numberOfInputs;
} else if (item.isEmpty()) {
item.numberOfInputs = numberOfInputs;
- if (numberOfInputs === 0)
- {
+ if (numberOfInputs === 0) {
item.numberOfOutputs = 2;
} else {
item.numberOfOutputs = item.numberOfInputs;
}
- } else {
- item.numberOfInputs = CalculateConnection(numberOfInputs,this.getNumberOfInputs(item));
- item.numberOfOutputs = this.getNumberOfOutputs(item);
+ } else {
+ if (item.numberOfInputs === 0) // zero-input plugins merge their output with the input.
+ {
+ item.numberOfInputs = numberOfInputs;
+ item.numberOfOutputs = Math.max(item.numberOfOutputs, numberOfInputs);
+ } else {
+ item.numberOfInputs = CalculateConnection(numberOfInputs, this.getNumberOfInputs(item));
+ item.numberOfOutputs = this.getNumberOfOutputs(item);
+ }
}
numberOfInputs = item.numberOfOutputs;
}
@@ -1196,21 +1257,20 @@ const PedalboardView =
let layoutChain = makeChain(this.model, this.state.pedalboard?.items);
let start = PedalLayout.Start();
let end = PedalLayout.End();
- if (layoutChain.length !== 0)
- {
+ if (layoutChain.length !== 0) {
layoutChain.splice(0, 0, start);
layoutChain.splice(layoutChain.length, 0, end);
- this.markStereoOutputs(layoutChain, 2,2);
+ this.markStereoOutputs(layoutChain, 2, 2);
}
let layoutSize = this.doLayout(layoutChain);
-
+
this.currentLayout = layoutChain; // save for mouse processing &c.
return (
+ >
{/* TITLE SECTION */}
- {isTrigger ? "\u00A0" : control.name}
+
+ {isTrigger ? "\u00A0" : control.name}
+
{/* CONTROL SECTION */}
diff --git a/react/src/PluginControlView.tsx b/react/src/PluginControlView.tsx
index 9027588..dcf77d2 100644
--- a/react/src/PluginControlView.tsx
+++ b/react/src/PluginControlView.tsx
@@ -40,6 +40,7 @@ import JsonAtom from './JsonAtom';
import PluginOutputControl from './PluginOutputControl';
import Units from './Units';
import ToobFrequencyResponseView from './ToobFrequencyResponseView';
+import Tooltip from '@mui/material/Tooltip';
export const StandardItemSize = { width: 80, height: 110 };
@@ -553,7 +554,11 @@ const PluginControlView =
result.push((
- {controlGroup.name}
+
+ {controlGroup.name}
+
{
diff --git a/react/src/PluginInfoDialog.tsx b/react/src/PluginInfoDialog.tsx
index 6d9e887..fb5d79d 100644
--- a/react/src/PluginInfoDialog.tsx
+++ b/react/src/PluginInfoDialog.tsx
@@ -37,11 +37,10 @@ import { UiPlugin, UiControl } from './Lv2Plugin';
import PluginIcon from './PluginIcon';
import { Remark } from 'react-remark';
- /* eslint-disable */
-let myTheme: Theme| undefined = undefined;
+/* eslint-disable */
+let myTheme: Theme | undefined = undefined;
-const styles = (theme: Theme) =>
-{
+const styles = (theme: Theme) => {
myTheme = theme;
return createStyles({
root: {
@@ -151,25 +150,26 @@ function makeControls(controls: UiControl[]) {
break;
}
}
+ hasComments = true;
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)
- trs.push((
-
- |
-
- {control.name}
-
- |
-
-
- {control.comment}
-
- |
-
- ));
+ trs.push((
+
+ |
+
+ {control.name}
+
+ |
+
+
+ {control.comment}
+
+ |
+
+ ));
}
return (
@@ -235,7 +235,7 @@ const PluginInfoDialog = withStyles(styles)((props: PluginInfoProps) => {
{open && (
-
@@ -258,18 +258,18 @@ const PluginInfoDialog = withStyles(styles)((props: PluginInfoProps) => {
-
+
@@ -286,40 +286,44 @@ const PluginInfoDialog = withStyles(styles)((props: PluginInfoProps) => {
{
makeControls(plugin.controls)
}
-
- Description:
-
-
-
{
- // return (
- //
- // );
- return (
-
- );
-
- },
- code: (props: any) => {
- return (
+
+ Description:
+
+
+
{
+ // return (
+ //
+ // );
+ return (
+
+ );
- }
- },
- }}
- >
- {plugin.description}
-
-
+ },
+ code: (props: any) => {
+ return (
);
+ },
+ a: (props: any) => {
+ return (
+
+ );
+
+ }
+ },
+ }}
+ >
+ {plugin.description}
+
+
+ )}
-
diff --git a/react/src/PluginOutputControl.tsx b/react/src/PluginOutputControl.tsx
index 2ed160a..0d1e231 100644
--- a/react/src/PluginOutputControl.tsx
+++ b/react/src/PluginOutputControl.tsx
@@ -24,10 +24,11 @@ import createStyles from '@mui/styles/createStyles';
import withStyles from '@mui/styles/withStyles';
import { UiControl } from './Lv2Plugin';
import Typography from '@mui/material/Typography';
-import { PiPedalModel, PiPedalModelFactory, MonitorPortHandle,State } from './PiPedalModel';
-import {isDarkMode} from './DarkMode';
+import { PiPedalModel, PiPedalModelFactory, MonitorPortHandle, State } from './PiPedalModel';
+import { isDarkMode } from './DarkMode';
import GxTunerControl from './GxTunerControl';
import Units from './Units';
+import ControlTooltip from './ControlTooltip';
@@ -74,8 +75,7 @@ type PluginOutputControlState = {
const PluginOutputControl =
withStyles(styles, { withTheme: true })(
- class extends Component
- {
+ class extends Component {
private model: PiPedalModel;
private vuRef: React.RefObject;
@@ -98,10 +98,8 @@ const PluginOutputControl =
this.onConnectionStateChanged = this.onConnectionStateChanged.bind(this);
}
- private onConnectionStateChanged(state: State)
- {
- if (state === State.Ready)
- {
+ private onConnectionStateChanged(state: State) {
+ if (state === State.Ready) {
this.unsubscribe();
this.subscribe();
}
@@ -127,40 +125,36 @@ const PluginOutputControl =
}
componentDidUpdate(prevProps: Readonly, prevState: Readonly, snapshot?: any): void {
- if (prevProps.instanceId !== this.props.instanceId)
- {
+ if (prevProps.instanceId !== this.props.instanceId) {
this.unsubscribe();
this.subscribe();
}
}
- private VU_HEIGHT = 60-4;
- private DB_VU_HEIGHT = 60-4;
+ private VU_HEIGHT = 60 - 4;
+ private DB_VU_HEIGHT = 60 - 4;
private animationHandle: number | undefined = undefined;
-
+
private dbVuTelltale = -96.0;
private dbVuValue = -96.0;
private dbVuHoldTime = 0.0;
private requestDbVuAnimation() {
- if (!this.animationHandle)
- {
+ if (!this.animationHandle) {
this.animationHandle = requestAnimationFrame(
- ()=> {
+ () => {
let value = this.dbVuValue;
let range = this.vuMap(value);
- let top = range-this.VU_HEIGHT;
+ let top = range - this.VU_HEIGHT;
if (top > 0) top = 0;
-
- if (value > this.dbVuTelltale)
- {
+
+ if (value > this.dbVuTelltale) {
this.dbVuTelltale = value;
- this.dbVuHoldTime = Date.now()+2000;
+ this.dbVuHoldTime = Date.now() + 2000;
}
- if (this.dbVuRef.current)
- {
- this.dbVuRef.current.style.marginTop = top+"px";
+ if (this.dbVuRef.current) {
+ this.dbVuRef.current.style.marginTop = top + "px";
}
this.animationHandle = undefined;
this.updateDbVuTelltale();
@@ -171,19 +165,16 @@ const PluginOutputControl =
updateDbVuTelltale() {
let telltaleDone = true;
- if (this.dbVuHoldTime !== 0)
- {
+ if (this.dbVuHoldTime !== 0) {
telltaleDone = false;
let t = Date.now();
- if (t >= this.dbVuHoldTime)
- {
- let dt = t-this.dbVuHoldTime;
- let telltaleValue = this.dbVuTelltale-30*dt/1000;
- if (telltaleValue < -200)
- {
+ if (t >= this.dbVuHoldTime) {
+ let dt = t - this.dbVuHoldTime;
+ let telltaleValue = this.dbVuTelltale - 30 * dt / 1000;
+ if (telltaleValue < -200) {
telltaleValue = -200;
telltaleDone = true;
- }
+ }
this.dbVuTelltale = telltaleValue;
this.dbVuHoldTime = t;
@@ -191,49 +182,41 @@ const PluginOutputControl =
let y = this.dbVuMap(this.dbVuTelltale);
if (y < 0) y = 0;
- if (this.dbVuTelltaleRef.current)
- {
+ if (this.dbVuTelltaleRef.current) {
let telltaleStyle = this.dbVuTelltaleRef.current.style;
telltaleStyle.marginTop = y + "px";
let telltaleColor = "#0C0";
- if (this.dbVuTelltale >= 0)
- {
+ if (this.dbVuTelltale >= 0) {
telltaleColor = "#F00";
- } else if (this.dbVuTelltale >= -10)
- {
+ } else if (this.dbVuTelltale >= -10) {
telltaleColor = "#FF0";
}
telltaleStyle.background = telltaleColor;
}
}
- if (!telltaleDone)
- {
+ if (!telltaleDone) {
this.requestDbVuAnimation();
}
}
private updateValue(value: number) {
- if (this.lampRef.current)
- {
+ if (this.lampRef.current) {
let control = this.props.uiControl;
- let range = (value-control.min_value)/(control.max_value-control.min_value);
- this.lampRef.current.style.opacity = range +"";
- } else if (this.dbVuRef.current)
- {
+ let range = (value - control.min_value) / (control.max_value - control.min_value);
+ this.lampRef.current.style.opacity = range + "";
+ } else if (this.dbVuRef.current) {
this.dbVuValue = value;
this.requestDbVuAnimation();
}
else if (this.vuRef.current) {
let control = this.props.uiControl;
- let range = (value-control.min_value)/(control.max_value-control.min_value);
- let top = this.VU_HEIGHT-range*this.VU_HEIGHT;
+ let range = (value - control.min_value) / (control.max_value - control.min_value);
+ let top = this.VU_HEIGHT - range * this.VU_HEIGHT;
- if (!this.animationHandle)
- {
+ if (!this.animationHandle) {
this.animationHandle = requestAnimationFrame(
- ()=> {
- if (this.vuRef.current)
- {
- this.vuRef.current.style.marginTop = top+"px";
+ () => {
+ if (this.vuRef.current) {
+ this.vuRef.current.style.marginTop = top + "px";
}
this.animationHandle = undefined;
}
@@ -284,13 +267,13 @@ const PluginOutputControl =
dbVuMap(value: number): number {
let control = this.props.uiControl;
- let y = (control.max_value-value)*this.DB_VU_HEIGHT/(control.max_value-control.min_value);
+ let y = (control.max_value - value) * this.DB_VU_HEIGHT / (control.max_value - control.min_value);
return y;
}
vuMap(value: number): number {
let control = this.props.uiControl;
- let y = (control.max_value-value)*this.VU_HEIGHT/(control.max_value-control.min_value);
+ let y = (control.max_value - value) * this.VU_HEIGHT / (control.max_value - control.min_value);
return y;
}
@@ -317,20 +300,18 @@ const PluginOutputControl =
item_width = 80;
}
}
- if (control.isTuner())
- {
+ if (control.isTuner()) {
item_width = undefined;
return (
-
+
);
- } else if (control.isDbVu())
- {
+ } else if (control.isDbVu()) {
item_width = undefined;
let redLevel = this.dbVuMap(0);
let yellowLevel = this.dbVuMap(-10);
@@ -338,22 +319,24 @@ const PluginOutputControl =
{/* TITLE SECTION */}
- {control.name === "" ? "\u00A0" : control.name}
+
+ {control.name === "" ? "\u00A0" : control.name}
+
{/* CONTROL SECTION */}
-
-
+
+
@@ -369,15 +352,17 @@ const PluginOutputControl =
{/* TITLE SECTION */}
- {control.name === "" ? "\u00A0" : control.name}
+
+ {control.name === "" ? "\u00A0" : control.name}
+
{/* CONTROL SECTION */}
-
-
+
+
@@ -394,26 +379,31 @@ const PluginOutputControl =
);
} else if (control.isLamp()) {
item_width = undefined;
- let attachedLamp = control.name === "" || control.name === "\u00A0" ;
+ let attachedLamp = control.name === "" || control.name === "\u00A0";
return (
-
+
{/* TITLE SECTION */}
- {control.name === "" ? "\u00A0": (control.name)}
+
+ {control.name === "" ? "\u00A0" : (control.name)}
+
{/* CONTROL SECTION */}
-
@@ -429,11 +419,14 @@ const PluginOutputControl =
{/* TITLE SECTION */}
- {control.name}
+
+ {control.name}
+
+
{/* CONTROL SECTION */}
@@ -449,15 +442,17 @@ const PluginOutputControl =
);
- }else {
+ } else {
return (
{/* TITLE SECTION */}
- {control.name}
+
+ {control.name}
+
{/* CONTROL SECTION */}
diff --git a/src/AlsaDriver.cpp b/src/AlsaDriver.cpp
index 47d1c3a..9b14d64 100644
--- a/src/AlsaDriver.cpp
+++ b/src/AlsaDriver.cpp
@@ -1257,7 +1257,7 @@ namespace pipedal
{
message =
SS("Device " << alsa_device_name << " in use. The following applications are using your soundcard: " << apps
- << ". Stop them as neccesary before trying to restart pipedald.");
+ << ". Stop them as neccesary before trying to pipedald.");
}
else
{
@@ -1671,11 +1671,16 @@ namespace pipedal
pBuffer[j] = 0;
}
}
- while (!terminateAudio())
+ try {
+ while (!terminateAudio())
+ {
+ std::this_thread::sleep_for(std::chrono::milliseconds(10));
+ // zero out input buffers.
+ this->driverHost->OnProcess(this->bufferSize);
+ }
+ } catch (const std::exception &e)
{
- std::this_thread::sleep_for(std::chrono::milliseconds(10));
- // zero out input buffers.
- this->driverHost->OnProcess(this->bufferSize);
+
}
}
this->driverHost->OnAudioTerminated();
diff --git a/src/AudioHost.cpp b/src/AudioHost.cpp
index 36c62aa..89af2c6 100644
--- a/src/AudioHost.cpp
+++ b/src/AudioHost.cpp
@@ -1217,7 +1217,7 @@ class AudioHostImpl : public AudioHost, private AudioDriverHost, private IPatchW
}
catch (const std::exception &e)
{
- Lv2Log::error("Fatal error while processing jack audio. (%s)", e.what());
+ Lv2Log::error("Fatal error while processing realtime audio. (%s)", e.what());
throw;
}
}
diff --git a/src/FilePropertyDirectoryTree.cpp b/src/FilePropertyDirectoryTree.cpp
index c73bbed..0098873 100644
--- a/src/FilePropertyDirectoryTree.cpp
+++ b/src/FilePropertyDirectoryTree.cpp
@@ -18,6 +18,7 @@
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "FilePropertyDirectoryTree.hpp"
+#include
using namespace pipedal;
namespace fs = std::filesystem;
diff --git a/src/IEffect.hpp b/src/IEffect.hpp
index 520c19b..d502d01 100644
--- a/src/IEffect.hpp
+++ b/src/IEffect.hpp
@@ -58,6 +58,7 @@ namespace pipedal {
virtual bool GetRequestStateChangedNotification() const = 0;
virtual void SetRequestStateChangedNotification(bool value) = 0;
+ virtual void PrepareNoInputEffect(int numberOfInputs, size_t maxBufferSize) = 0;
virtual void SetAudioInputBuffer(int index, float *buffer) = 0;
virtual void SetAudioOutputBuffer(int index, float*buffer) = 0;
diff --git a/src/Lv2Effect.cpp b/src/Lv2Effect.cpp
index 3f4863d..75a86c4 100644
--- a/src/Lv2Effect.cpp
+++ b/src/Lv2Effect.cpp
@@ -47,7 +47,6 @@ namespace fs = std::filesystem;
const float BYPASS_TIME_S = 0.1f;
-
static fs::path makeAbsolutePath(const std::filesystem::path &path, const std::filesystem::path &parentPath)
{
if (path.is_absolute())
@@ -57,7 +56,6 @@ static fs::path makeAbsolutePath(const std::filesystem::path &path, const std::f
return parentPath / path;
}
-
Lv2Effect::Lv2Effect(
IHost *pHost_,
const std::shared_ptr &info_,
@@ -83,9 +81,9 @@ Lv2Effect::Lv2Effect(
this->pathPropertyWriters.push_back(PatchPropertyWriter(instanceId, filePropertyUrid));
}
}
- for (auto &pathProperty: pedalboardItem.pathProperties_)
+ for (auto &pathProperty : pedalboardItem.pathProperties_)
{
- SetPathPatchProperty(pathProperty.first,pathProperty.second);
+ SetPathPatchProperty(pathProperty.first, pathProperty.second);
}
// initialize the atom forge used on the realtime thread.
@@ -112,7 +110,6 @@ Lv2Effect::Lv2Effect(
bundleUriString,
storagePath);
-
mapPathFeature.Prepare(&(pHost_->GetMapFeature()));
mapPathFeature.SetPluginStoragePath(pHost_->GetPluginStoragePath());
if (info->piPedalUI())
@@ -122,10 +119,8 @@ Lv2Effect::Lv2Effect(
{
if (!fileProperty->resourceDirectory().empty())
{
- mapPathFeature.AddResourceFileMapping({
- makeAbsolutePath(fileProperty->resourceDirectory(),bundleUriString),
- makeAbsolutePath(fileProperty->directory(),pHost_->GetPluginStoragePath())
- });
+ mapPathFeature.AddResourceFileMapping({makeAbsolutePath(fileProperty->resourceDirectory(), bundleUriString),
+ makeAbsolutePath(fileProperty->directory(), pHost_->GetPluginStoragePath())});
}
}
}
@@ -145,7 +140,6 @@ Lv2Effect::Lv2Effect(
this->features.push_back(mapPathFeature.GetMakePathFeature());
this->features.push_back(mapPathFeature.GetFreePathFeature());
-
this->features.push_back(this->fileBrowserFilesFeature.GetFeature());
this->work_schedule_feature = nullptr;
@@ -370,15 +364,52 @@ void Lv2Effect::PreparePortIndices()
outputAtomBuffers.resize(outputAtomPortIndices.size());
}
-void Lv2Effect::SetAudioInputBuffer(int index, float *buffer)
+void Lv2Effect::PrepareNoInputEffect(int numberOfInputs, size_t maxBufferSize)
{
- if (index >= inputAudioPortIndices.size())
+ if (outputAudioPortIndices.size() == 0)
+ {
+ // pass the input through unmodified.
+ inputAudioBuffers.resize(std::max((size_t)numberOfInputs, inputAudioPortIndices.size()));
+ outputAudioBuffers.resize(numberOfOutputs);
+ }
+ else if (inputAudioPortIndices.size() == 0)
{
- throw PiPedalArgumentException("Buffer index out of range.");
+ inputAudioBuffers.resize(numberOfInputs);
+ outputAudioBuffers.resize(std::max((size_t)numberOfInputs, outputAudioPortIndices.size()));
+
+ // allocate a working buffer which we will mix with passed-through data.
+ outputMixBuffers.resize(outputAudioPortIndices.size());
+ for (size_t i = 0; i < outputMixBuffers.size(); ++i)
+ {
+ outputMixBuffers[i].resize(maxBufferSize);
+ }
+ // connect the plugin to the mix buffer instead of output buffer.
+ for (size_t i = 0; i < outputAudioPortIndices.size(); ++i)
+ {
+ int pluginIndex = this->outputAudioPortIndices[i];
+ lilv_instance_connect_port(this->pInstance, pluginIndex, outputMixBuffers[i].data());
+ }
}
+}
+
+void Lv2Effect::SetAudioInputBuffer(int index, float *buffer)
+{
this->inputAudioBuffers[index] = buffer;
- int pluginIndex = this->inputAudioPortIndices[index];
- lilv_instance_connect_port(this->pInstance, pluginIndex, buffer);
+
+ if (inputAudioPortIndices.size() == inputAudioBuffers.size())
+ {
+ int pluginIndex = this->inputAudioPortIndices[index];
+ lilv_instance_connect_port(this->pInstance, pluginIndex, 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);
+ }
+ }
}
void Lv2Effect::SetAudioInputBuffer(float *left)
@@ -388,7 +419,7 @@ void Lv2Effect::SetAudioInputBuffer(float *left)
SetAudioInputBuffer(0, left);
SetAudioInputBuffer(1, left);
}
- else
+ else if (GetNumberOfInputAudioPorts() != 0) /// yyx MIXING!
{
SetAudioInputBuffer(0, left);
}
@@ -400,7 +431,7 @@ void Lv2Effect::SetAudioInputBuffers(float *left, float *right)
{
SetAudioInputBuffer(0, left);
}
- else
+ else if (GetNumberOfInputAudioPorts() > 1)
{
SetAudioInputBuffer(0, left);
SetAudioInputBuffer(1, right);
@@ -410,8 +441,15 @@ void Lv2Effect::SetAudioInputBuffers(float *left, float *right)
void Lv2Effect::SetAudioOutputBuffer(int index, float *buffer)
{
this->outputAudioBuffers[index] = buffer;
- int pluginIndex = this->outputAudioPortIndices[index];
- lilv_instance_connect_port(pInstance, pluginIndex, buffer);
+
+ if (this->inputAudioPortIndices.size() != 0) // i.e. we're not mixing a zero-input control
+ {
+ if ((size_t)index < this->inputAudioPortIndices.size())
+ {
+ int pluginIndex = this->outputAudioPortIndices[index];
+ lilv_instance_connect_port(pInstance, pluginIndex, buffer);
+ }
+ }
}
int Lv2Effect::GetControlIndex(const std::string &key) const
@@ -452,7 +490,7 @@ void Lv2Effect::Activate()
void Lv2Effect::AssignUnconnectedPorts()
{
- for (int i = 0; i < this->GetNumberOfInputAudioPorts(); ++i)
+ for (size_t i = 0; i < this->inputAudioPortIndices.size(); ++i)
{
if (GetAudioInputBuffer(i) == nullptr)
{
@@ -462,14 +500,16 @@ void Lv2Effect::AssignUnconnectedPorts()
lilv_instance_connect_port(pInstance, pluginIndex, buffer);
}
}
- for (int i = 0; i < this->GetNumberOfOutputAudioPorts(); ++i)
+
+ if (this->inputAudioPortIndices.size() != 0) // i.e. not using a mix buffer.
{
- if (GetAudioOutputBuffer(i) == nullptr)
+ for (size_t i = 0; i < this->outputAudioPortIndices.size(); ++i)
{
- int pluginIndex = this->outputAudioPortIndices[i];
-
- float *buffer = bufferPool.AllocateBuffer(pHost->GetMaxAudioBufferSize());
- lilv_instance_connect_port(pInstance, pluginIndex, buffer);
+ if (GetAudioOutputBuffer(i) == nullptr)
+ {
+ float *buffer = bufferPool.AllocateBuffer(pHost->GetMaxAudioBufferSize());
+ int pluginIndex = this->outputAudioPortIndices[i];
+ }
}
}
for (int i = 0; i < this->GetNumberOfInputAtomPorts(); ++i)
@@ -529,6 +569,61 @@ void Lv2Effect::Run(uint32_t samples, RealtimeRingBufferWriter *realtimeRingBuff
// relay worker response
worker->EmitResponses();
}
+ // for zero-input plugins, mix the plugin output with the input signal.
+ if (this->inputAudioPortIndices.size() == 0)
+ {
+
+ // mix a zero input controls into the output buffer using a triangular mix curve.
+ float pluginLevel = std::max(1.0f, this->zeroInputMix * 2);
+ float inputLevel = std::max(1.0f, (1 - this->zeroInputMix) * 2);
+
+ // case
+ // 1 plugin output into 1 output.
+ // 2 plugin outputs into 2 outputs.
+ if (this->outputAudioBuffers.size() == this->outputMixBuffers.size())
+ {
+ for (size_t i = 0; i < this->outputMixBuffers.size(); ++i)
+ {
+ float *__restrict input;
+ if (i >= this->inputAudioBuffers.size()) {
+ if (this->inputAudioBuffers.size() == 0)
+ {
+ break;
+ }
+ input = this->inputAudioBuffers[0];
+ } else {
+ input = this->inputAudioBuffers[i];
+ }
+ float *__restrict pluginOutput = this->outputMixBuffers[i].data();
+ float *__restrict finalOutput = this->outputAudioBuffers[i];
+
+ for (uint32_t i = 0; i < samples; ++i)
+ {
+ finalOutput[i] = input[i] * inputLevel + pluginOutput[i] * pluginLevel;
+ }
+ }
+ }
+ else if (this->outputAudioPortIndices.size() == 1 && this->outputAudioBuffers.size() == 2)
+ {
+ // 1 plugin output into 2 outputs.
+ float *__restrict pluginOutput = this->outputMixBuffers[0].data();
+ for (size_t i = 0; i < this->outputMixBuffers.size(); ++i)
+ {
+ float *__restrict input = this->inputAudioBuffers[i];
+ float *__restrict finalOutput = this->outputAudioBuffers[i];
+
+ for (uint32_t i = 0; i < samples; ++i)
+ {
+ finalOutput[i] = input[i] * inputLevel + pluginOutput[i] * pluginLevel;
+ }
+ }
+ }
+ else
+ {
+ // e.g. 2 plugin outputs into 1 output (should never happen)
+ std::runtime_error("Internal error 0xEA48");
+ }
+ }
// do soft bypass.
if (this->bypassSamplesRemaining == 0)
diff --git a/src/Lv2Effect.hpp b/src/Lv2Effect.hpp
index a6d5417..3a7abed 100644
--- a/src/Lv2Effect.hpp
+++ b/src/Lv2Effect.hpp
@@ -193,9 +193,12 @@ namespace pipedal
bool requestStateChangedNotification = false;
+ float zeroInputMix = 0.5f;
+ int actualAudioInputs = 0;
+ int actualAudioOutputs = 0;
+ std::vector> outputMixBuffers;
void BypassTo(float value);
-
public:
// non RT-thread use only.
@@ -242,6 +245,9 @@ namespace pipedal
bool HasErrorMessage() const { return this->hasErrorMessage; }
const char*TakeErrorMessage() { this->hasErrorMessage = false; return this->errorMessage; }
+ virtual void PrepareNoInputEffect(int numberOfInputs,size_t maxBufferSize) override;
+
+
virtual void ResetAtomBuffers();
virtual uint64_t GetInstanceId() const { return instanceId; }
virtual int GetNumberOfInputAudioPorts() const { return inputAudioPortIndices.size(); }
@@ -251,6 +257,8 @@ namespace pipedal
virtual int GetNumberOfMidiInputPorts() const { return inputMidiPortIndices.size(); }
virtual int GetNumberOfMidiOutputPorts() const { return outputMidiPortIndices.size(); }
+
+
virtual void SetAudioInputBuffer(int index, float *buffer);
virtual float *GetAudioInputBuffer(int index) const { return this->inputAudioBuffers[index]; }
diff --git a/src/Lv2Pedalboard.cpp b/src/Lv2Pedalboard.cpp
index 44d8697..32f685b 100644
--- a/src/Lv2Pedalboard.cpp
+++ b/src/Lv2Pedalboard.cpp
@@ -121,6 +121,7 @@ std::vector Lv2Pedalboard::PrepareItems(
if (pLv2Effect)
{
+
if (pLv2Effect->HasErrorMessage())
{
std::string error = pLv2Effect->TakeErrorMessage();
@@ -131,6 +132,7 @@ std::vector Lv2Pedalboard::PrepareItems(
pEffect = pLv2Effect;
uint64_t instanceId = pEffect->GetInstanceId();
+ pLv2Effect->PrepareNoInputEffect(inputBuffers.size(),pHost->GetMaxAudioBufferSize());
if (inputBuffers.size() == 1)
{
@@ -207,7 +209,7 @@ std::vector Lv2Pedalboard::PrepareItems(
effectOutput.push_back(CreateNewAudioBuffer());
}
#endif
- for (size_t i = 0; i < effectOutput.size(); ++i)
+ for (size_t i = 0; i < effectOutput.size(); ++i)
{
pEffect->SetAudioOutputBuffer(i, effectOutput[i]);
}
diff --git a/src/PiPedalModel.cpp b/src/PiPedalModel.cpp
index dc1950b..ad0e6e5 100644
--- a/src/PiPedalModel.cpp
+++ b/src/PiPedalModel.cpp
@@ -2782,6 +2782,7 @@ void PiPedalModel::OnAlsaDriverTerminatedAbnormally() {
Lv2Log::info("Restarting audio.");
this->RestartAudio();
});
+ ++audioRestartRetries;
} else if (audioRestartRetries < 3)
{
this->audioRetryPostHandle = this->PostDelayed(
@@ -2794,13 +2795,21 @@ void PiPedalModel::OnAlsaDriverTerminatedAbnormally() {
RestartAudio();
});
+ ++audioRestartRetries;
+ } else if (audioRestartRetries == 3) // one attempt to start the dummy driver.
+ {
+ {
+ this->audioRetryPostHandle = this->Post(
+ // No lock to avoid deadlocks!
+ [this]() {
+ Lv2Log::info(SS("Switching to dummy driver."));
+ RestartAudio(true); // switch to the dummy driver.
+ });
+ }
+ ++audioRestartRetries;
} else {
- this->audioRetryPostHandle = this->Post(
- // No lock to avoid deadlocks!
- [this]() {
- Lv2Log::info(SS("Switching to dummy driver."));
- RestartAudio(true); // switch to the dummy driver.
- });
+ Lv2Log::error(SS("Unable to reastart audio."));
+
}
});
}
diff --git a/src/PluginHost.cpp b/src/PluginHost.cpp
index 1d0ae47..fa11927 100644
--- a/src/PluginHost.cpp
+++ b/src/PluginHost.cpp
@@ -482,7 +482,19 @@ void PluginHost::Load(const char *lv2Path)
Lv2PluginUiInfo info(this, plugin.get());
if (plugin->is_valid())
{
-#if SUPPORT_MIDI
+#if 1
+ if (info.audio_inputs() > 2 || info.audio_outputs() > 2) {
+ Lv2Log::debug(
+ "Plugin %s (%s) skipped. %d inputs, %d outputs.", plugin->name().c_str(), plugin->uri().c_str(),
+ (int)info.audio_inputs(),(int)info.audio_outputs());
+
+ }
+ else if (info.audio_inputs() == 0 && info.audio_outputs() == 0 )
+ {
+ Lv2Log::debug("Plugin %s (%s) skipped. No audio i/o.", plugin->name().c_str(), plugin->uri().c_str());
+
+ }
+#elif SUPPORT_MIDI
if (info.audio_inputs() == 0 && !info.has_midi_input())
{
Lv2Log::debug("Plugin %s (%s) skipped. No inputs.", plugin->name().c_str(), plugin->uri().c_str());
@@ -503,6 +515,12 @@ void PluginHost::Load(const char *lv2Path)
#endif
else
{
+ if (info.audio_inputs() == 0) {
+ Lv2Log::debug("************* ZERO INPUTS: %s (%s) skipped. No audio outputs.", plugin->name().c_str(), plugin->uri().c_str());
+ }
+ if (info.audio_outputs() == 0) {
+ Lv2Log::debug("************* ZERO OUTPUTS: %s (%s) skipped. No audio outputs.", plugin->name().c_str(), plugin->uri().c_str());
+ }
ui_plugins_.push_back(std::move(info));
}
}
diff --git a/src/PresetBundle.hpp b/src/PresetBundle.hpp
index 84c37ce..b766ff9 100644
--- a/src/PresetBundle.hpp
+++ b/src/PresetBundle.hpp
@@ -20,6 +20,7 @@
#pragma once
#include
+#include
namespace pipedal {
class PiPedalModel;
diff --git a/src/SplitEffect.hpp b/src/SplitEffect.hpp
index b85fdc2..b306570 100644
--- a/src/SplitEffect.hpp
+++ b/src/SplitEffect.hpp
@@ -370,6 +370,9 @@ namespace pipedal
virtual void RequestAllPathPatchProperties() {}
+ virtual void PrepareNoInputEffect(int numberOfInputs,size_t maxBufferSize) override {
+ // do nothing.
+ }
virtual int GetNumberOfOutputAudioPorts() const
{
return numberOfOutputPorts;
diff --git a/src/Updater.hpp b/src/Updater.hpp
index 201422b..24e760d 100644
--- a/src/Updater.hpp
+++ b/src/Updater.hpp
@@ -27,6 +27,7 @@
#include "json.hpp"
#include
#include "UpdaterStatus.hpp"
+#include
namespace pipedal
diff --git a/src/pch.h b/src/pch.h
index 7dca65f..9b33fd3 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -24,7 +24,7 @@
template class TypeDisplay;
#ifndef SUPPORT_MIDI // currently, only whether midi plugins can be loaded. No routing or handling implemented (yet).
-#define SUPPORT_MIDI 0
+#define SUPPORT_MIDI 1
#endif
@@ -32,33 +32,9 @@ template class TypeDisplay;
#include
#include
-#include
#include
-#include
#include