shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP Sync

Browse Source
This commit is contained in:
Robin E.R. Davies
2026-01-27 23:45:13 -05:00
parent 96cb9967aa
commit 6c441ecfee
28 changed files with 480 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/AlsaDriver.cpp
-5
View File
@@ -354,11 +354,6 @@ namespace pipedal
std::vector<OutputBufferMix> outputBufferMixes;
std::vector<float *> deviceCaptureBuffers;
std::vector<float *> devicePlaybackBuffers;
std::vector<uint8_t> rawCaptureBuffer;
std::vector<uint8_t> rawPlaybackBuffer;
src/AlsaDriver.hpp
+2 -1
View File
@@ -1,7 +1,7 @@
/*
* MIT License
*
* Copyright (c) 2025 Robin E. R. Davies
* Copyright (c) 2026 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
@@ -24,6 +24,7 @@
#pragma once
#include <lilv/lilv.h>
#include "AudioDriver.hpp"
#include "JackServerSettings.hpp"
src/AlsaDriverTest.cpp
+109 -94
View File
@@ -1,18 +1,18 @@
/*
* MIT License
*
*
* Copyright (c) 2022 Robin E. R. Davies
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of
* this software and associated documentation files (the "Software"), to deal in
* the Software without restriction, including without limitation the rights to
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is furnished to do
* so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,28 +27,34 @@
#include <cmath>
#include <mutex>
#include <iostream>
#include <algorithm>
#include "AlsaDriver.hpp"
#include "JackDriver.hpp"
#include "ChannelRouterSettings.hpp"
using namespace pipedal;
using namespace std;
class AlsaTester: private AudioDriverHost {
class AlsaTester : private AudioDriverHost
{
public:
enum class TestType { Oscillator, LatencyMonitor, NullTest};
enum class TestType
{
Oscillator,
LatencyMonitor,
NullTest
};
private:
AudioDriver *audioDriver = nullptr;
TestType testType;
public:
AlsaTester(TestType testType)
: testType(testType)
: testType(testType)
{
// audioDriver = CreateAlsaDriver(this);
// audioDriver = CreateJackDriver(this);
}
~AlsaTester()
{
@@ -57,47 +63,47 @@ public:
delete[] outputBuffers;
}
bool useJack = false;
void initializeChannelSelection(JackConfiguration &jackConfiguration, ChannelSelection &channelSelection)
{
size_t nInputs = std::max(jackConfiguration.inputAudioPorts().size(),size_t(2));
size_t nOutputs = std::max(jackConfiguration.outputAudioPorts().size(),size_t(2));
auto &inputSelections = channelSelection.mainInputChannels();
auto &outputSelections = channelSelection.mainOutputChannels();
inputSelections.resize(nInputs);
for (size_t i = 0; i < nInputs; ++i)
{
inputSelections[i] = i;
}
outputSelections.resize(nOutputs);
for (size_t i = 0; i < nOutputs; ++i)
{
outputSelections[i] = i;
}
}
void Test()
{
AlsaFormatEncodeDecodeTest(this);
JackServerSettings serverSettings("hw:M2","hw:M2",48000,32,3);
JackServerSettings serverSettings("hw:M2", "hw:M2", 48000, 32, 3);
JackConfiguration jackConfiguration;
if (useJack)
{
jackConfiguration.JackInitialize();
} else {
jackConfiguration.AlsaInitialize(serverSettings);
}
jackConfiguration.AlsaInitialize(serverSettings);
JackChannelSelection channelSelection(
jackConfiguration.inputAudioPorts(),
jackConfiguration.outputAudioPorts(),
jackConfiguration.inputMidiDevices());
ChannelSelection channelSelection;
#if JACK_HOST
if (useJack)
{
audioDriver = CreateJackDriver(this);
} else {
audioDriver = CreateAlsaDriver(this);
}
#else
audioDriver = CreateAlsaDriver(this);
#endif
initializeChannelSelection(jackConfiguration, channelSelection);
oscillator.Init(440,jackConfiguration.sampleRate());
oscillator.Init(440, jackConfiguration.sampleRate());
latencyMonitor.Init(jackConfiguration.sampleRate());
audioDriver->Open(serverSettings,channelSelection);
audioDriver->Open(serverSettings, channelSelection);
inputBuffers = new float*[channelSelection.GetInputAudioPorts().size()];
outputBuffers = new float*[channelSelection.GetOutputAudioPorts().size()];
inputBuffers = new float *[channelSelection.mainInputChannels().size()];
outputBuffers = new float *[channelSelection.mainOutputChannels().size()];
audioDriver->Activate();
@@ -107,7 +113,7 @@ public:
if (testType == TestType::LatencyMonitor)
{
auto latency = this->latencyMonitor.GetLatency();
double ms = 1000.0*latency/jackConfiguration.sampleRate();
double ms = 1000.0 * latency / jackConfiguration.sampleRate();
cout << "Latency: " << latency << " samples " << ms << "ms" << " xruns: " << GetXruns() << " Cpu: " << audioDriver->CpuUse() << "%" << endl;
}
@@ -115,37 +121,40 @@ public:
audioDriver->Deactivate();
audioDriver->Close();
}
float**inputBuffers = nullptr;
float**outputBuffers = nullptr;
float **inputBuffers = nullptr;
float **outputBuffers = nullptr;
class Oscillator {
class Oscillator
{
private:
double dx = 0;
double x = 0;
double dx2 = 0;
double x2 = 0;
public:
public:
void Init(float frequency, size_t sampleRate)
{
dx = frequency*3.141592736*2/sampleRate;
dx2 = 0.5*3.141592736*2/sampleRate;
dx = frequency * 3.141592736 * 2 / sampleRate;
dx2 = 0.5 * 3.141592736 * 2 / sampleRate;
}
float Next() {
float Next()
{
float result = (float)std::cos(x);
float env = (float)std::cos(x2);
x += dx;
x2 += dx2;
return result*env;
return result * env;
}
};
class LatencyMonitor {
enum class State {
class LatencyMonitor
{
enum class State
{
Idle,
Waiting,
};
@@ -156,67 +165,74 @@ public:
size_t current_latency = 0;
size_t latency = 0;
std::mutex sync;
public:
void Init(uint64_t sampleRate)
{
idle_samples = (uint64_t)sampleRate*2;
waiting_samples = (uint64_t)sampleRate*2;
idle_samples = (uint64_t)sampleRate * 2;
waiting_samples = (uint64_t)sampleRate * 2;
state = State::Idle;
t = idle_samples;
latency = 0;
}
size_t GetLatency() {
std::lock_guard lock { sync};
size_t GetLatency()
{
std::lock_guard lock{sync};
return latency;
}
float Next(float input)
{
switch(state)
switch (state)
{
default:
case State::Idle:
default:
case State::Idle:
{
if (t-- == 0)
{
if (t-- == 0) {
state = State::Waiting;
current_latency = 0;
}
return 0.01;
state = State::Waiting;
current_latency = 0;
}
break;
case State::Waiting:
return 0.01;
}
break;
case State::Waiting:
{
if (std::abs(input) > 0.1 || current_latency > 500)
{
if (std::abs(input) > 0.1 || current_latency > 500) {
{
std::lock_guard lock { sync};
latency = current_latency;
}
state = State::Idle;
t = idle_samples;
} else {
++current_latency;
{
std::lock_guard lock{sync};
latency = current_latency;
}
return current_latency < 100 ? 0.25 : 0.0;
state = State::Idle;
t = idle_samples;
}
break;
else
{
++current_latency;
}
return current_latency < 100 ? 0.25 : 0.0;
}
break;
}
}
};
Oscillator oscillator;
LatencyMonitor latencyMonitor;
virtual void OnAudioTerminated() {
virtual void OnAudioTerminated()
{
}
virtual void OnAlsaDriverStopped() {
virtual void OnAlsaDriverStopped()
{
}
virtual void OnProcess(size_t nFrames) {
if (testType == TestType::NullTest) return;
virtual void OnProcess(size_t nFrames)
{
if (testType == TestType::NullTest)
return;
size_t inputs = audioDriver->MainInputBufferCount();
size_t outputs = audioDriver->MainOutputBufferCount();
@@ -233,14 +249,15 @@ public:
{
for (size_t i = 0; i < nFrames; ++i)
{
float v = oscillator.Next()*0.25f;
float v = oscillator.Next() * 0.25f;
for (size_t c = 0; c < outputs; ++c)
{
outputBuffers[c][i] = v;
}
}
}
else {
else
{
for (size_t i = 0; i < nFrames; ++i)
{
float v = latencyMonitor.Next(inputBuffers[0][i]);
@@ -249,36 +266,34 @@ public:
outputBuffers[c][i] = v;
}
}
}
}
std::mutex sync;
uint64_t xruns;
uint64_t GetXruns() {
lock_guard lock { sync};
uint64_t GetXruns()
{
lock_guard lock{sync};
return xruns;
}
virtual void OnUnderrun() {
lock_guard lock { sync };
virtual void OnUnderrun()
{
lock_guard lock{sync};
++xruns;
}
};
TEST_CASE("alsa_test", "[alsa_test]")
{
TEST_CASE( "alsa_test", "[alsa_test]" ) {
AlsaTester alsaDriver(AlsaTester::TestType::Oscillator);
alsaDriver.Test();
}
TEST_CASE( "alsa_midi_test", "[alsa_midi_test]" ) {
TEST_CASE("alsa_midi_test", "[alsa_midi_test]")
{
AlsaTester alsaDriver(AlsaTester::TestType::Oscillator);
MidiDecoderTest();
}
src/AudioHost.cpp
+4 -4
View File
@@ -1900,11 +1900,11 @@ public:
PIPEDAL_NON_INLINE RealtimePedalboardItemIndex GetRealtimeItemIndex(int64_t instanceId)
{
Pedalboard::InstanceType instanceType = Pedalboard::GetInstanceTypeFromInstanceId(instanceId);
Pedalboard::PedalboardType instanceType = Pedalboard::GetInstanceTypeFromInstanceId(instanceId);
int64_t index = -1;
switch (instanceType)
{
case Pedalboard::InstanceType::MainPedalboard:
case Pedalboard::PedalboardType::MainPedalboard:
if (this->currentPedalboard) {
if (instanceId == Pedalboard::START_CONTROL_ID) {
index = Pedalboard::START_CONTROL_ID;
@@ -1915,7 +1915,7 @@ public:
}
}
break;
case Pedalboard::InstanceType::MainInsert:
case Pedalboard::PedalboardType::MainInsert:
if (this->currentMainInsertPedalboard) {
if (instanceId == Pedalboard::MAIN_INSERT_START_CONTROL_ID) {
index = Pedalboard::MAIN_INSERT_START_CONTROL_ID;
@@ -1926,7 +1926,7 @@ public:
}
}
break;
case Pedalboard::InstanceType::AuxInsert:
case Pedalboard::PedalboardType::AuxInsert:
if (this->currentAuxInsertPedalboard) {
if (instanceId == Pedalboard::AUX_INSERT_START_CONTROL_ID) {
index = Pedalboard::START_CONTROL_ID;
src/Banks.hpp
+1 -1
View File
@@ -240,7 +240,7 @@ namespace pipedal
{
// zero length? We can never have a zero-length bank.
// Add a default preset and make it the selected preset.
Pedalboard pedalboard = Pedalboard::MakeDefault(Pedalboard::InstanceType::MainPedalboard);
Pedalboard pedalboard = Pedalboard::MakeDefault(Pedalboard::PedalboardType::MainPedalboard);
this->addPreset(pedalboard);
newSelection = presets_[0]->instanceId();
}
src/CMakeLists.txt
+9 -3
View File
@@ -352,8 +352,9 @@ target_compile_definitions(libpipedald PUBLIC "_REENTRANT")
target_include_directories(libpipedald PUBLIC ${PIPEDAL_INCLUDES})
target_link_libraries(libpipedald
PUBLIC
PUBLIC
PiPedalCommon
PRIVATE
SQLiteCpp
${PipeWire_LIBRARIES}
)
@@ -762,6 +763,7 @@ add_executable(pipedal_latency_test
target_link_libraries(pipedal_latency_test PRIVATE pthread asound PiPedalCommon)
target_include_directories(pipedal_latency_test PRIVATE ${PIPEDAL_INCLUDES})
add_executable(pipedal_alsa_info
alsaCheck.cpp alsaCheck.hpp
@@ -859,10 +861,14 @@ add_custom_target (
)
install (TARGETS pipedalconfig pipedal_kconfig pipedal_latency_test DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
EXPORT pipedalTargets)
EXPORT pipedalTargets
)
install (TARGETS pipedald pipedaladmind pipedal_update DESTINATION ${CMAKE_INSTALL_PREFIX}/sbin
EXPORT pipedalSbinTargets)
EXPORT pipedalSbinTargets
)
src/ChannelRouterSettings.cpp
+2 -2
View File
@@ -129,8 +129,8 @@ void ChannelSelection::normalizeChannelSelection() {
ChannelRouterSettings::ChannelRouterSettings()
: mainInserts_(Pedalboard::InstanceType::MainInsert)
, auxInserts_(Pedalboard::InstanceType::AuxInsert)
: mainInserts_(Pedalboard::PedalboardType::MainInsert)
, auxInserts_(Pedalboard::PedalboardType::AuxInsert)
{
}
src/ChannelRouterSettings.hpp
+23 -17
View File
@@ -49,7 +49,7 @@ namespace pipedal
std::vector<ControlValue> controlValues_;
public:
public:
using self = ChannelRouterSettings;
using ptr = std::shared_ptr<self>;
@@ -57,7 +57,7 @@ namespace pipedal
uint64_t numberOfAudioInputChannels() const;
uint64_t numberOfAudioOutputChannels() const;
JSON_GETTER_SETTER(configured)
JSON_GETTER_SETTER(channelRouterPresetId)
JSON_GETTER_SETTER_REF(mainInputChannels)
@@ -70,28 +70,34 @@ namespace pipedal
JSON_GETTER_SETTER_REF(sendOutputChannels)
JSON_GETTER_SETTER_REF(controlValues)
DECLARE_JSON_MAP(ChannelRouterSettings);
};
// just the channel selecttions.
class ChannelSelection {
// just the channel selecttions.
class ChannelSelection
{
public:
ChannelSelection() = default;
ChannelSelection(ChannelRouterSettings&settings);
ChannelSelection(const ChannelSelection&other) = default;
ChannelSelection(ChannelSelection&&other) = default;
ChannelSelection& operator=(const ChannelSelection&other) = default;
ChannelSelection& operator=(ChannelSelection&&other) = default;
ChannelSelection(ChannelRouterSettings &settings);
ChannelSelection(const ChannelSelection &other) = default;
ChannelSelection(ChannelSelection &&other) = default;
ChannelSelection &operator=(const ChannelSelection &other) = default;
ChannelSelection &operator=(ChannelSelection &&other) = default;
~ChannelSelection() = default;
const std::vector<int64_t>&mainInputChannels() const { return mainInputChannels_; }
const std::vector<int64_t>&mainOutputChannels() const { return mainOutputChannels_; }
const std::vector<int64_t>&auxInputChannels() const { return auxInputChannels_; }
const std::vector<int64_t>&auxOutputChannels() const { return auxOutputChannels_; }
const std::vector<int64_t>&sendInputChannels() const { return sendInputChannels_; }
const std::vector<int64_t>&sendOutputChannels() const { return sendOutputChannels_; }
const std::vector<int64_t> &mainInputChannels() const { return mainInputChannels_; }
const std::vector<int64_t> &mainOutputChannels() const { return mainOutputChannels_; }
const std::vector<int64_t> &auxInputChannels() const { return auxInputChannels_; }
const std::vector<int64_t> &auxOutputChannels() const { return auxOutputChannels_; }
const std::vector<int64_t> &sendInputChannels() const { return sendInputChannels_; }
const std::vector<int64_t> &sendOutputChannels() const { return sendOutputChannels_; }
std::vector<int64_t> &mainInputChannels() { return mainInputChannels_; }
std::vector<int64_t> &mainOutputChannels() { return mainOutputChannels_; }
std::vector<int64_t> &auxInputChannels() { return auxInputChannels_; }
std::vector<int64_t> &auxOutputChannels() { return auxOutputChannels_; }
std::vector<int64_t> &sendInputChannels() { return sendInputChannels_; }
std::vector<int64_t> &sendOutputChannels() { return sendOutputChannels_; }
private:
void normalizeChannelSelection();
src/DummyAudioDriver.hpp
+1
View File
@@ -24,6 +24,7 @@
#pragma once
#include <lilv/lilv.h>
#include "AudioDriver.hpp"
#include "JackServerSettings.hpp"
src/Lv2Pedalboard.cpp
+40 -3
View File
@@ -320,6 +320,7 @@ std::vector<float *> Lv2Pedalboard::PrepareItems(
void Lv2Pedalboard::Prepare(IHost *pHost, Pedalboard &pedalboard, Lv2PedalboardErrorList &errorList, ExistingEffectMap *existingEffects)
{
this->pHost = pHost;
this->pedalboardType = pedalboard.GetInstanceType();
inputVolume.SetSampleRate((float)(this->pHost->GetSampleRate()));
outputVolume.SetSampleRate((float)(this->pHost->GetSampleRate()));
@@ -329,13 +330,15 @@ void Lv2Pedalboard::Prepare(IHost *pHost, Pedalboard &pedalboard, Lv2PedalboardE
inputVolume.SetTarget(pedalboard.input_volume_db());
outputVolume.SetTarget(pedalboard.output_volume_db());
for (int i = 0; i < pHost->GetNumberOfInputAudioChannels(); ++i)
size_t nInputs = std::max(GetNumberOfAudioInputChannels(),(size_t)1);
for (size_t i = 0; i < nInputs; ++i)
{
this->pedalboardInputBuffers.push_back(bufferPool.AllocateBuffer<float>(pHost->GetMaxAudioBufferSize()));
}
auto outputs = PrepareItems(pedalboard.items(), this->pedalboardInputBuffers, errorList, existingEffects);
int nOutputs = pHost->GetNumberOfOutputAudioChannels();
size_t nOutputs = GetNumberOfAudioOutputChannels();
if (nOutputs == 1)
{
this->pedalboardOutputBuffers.push_back(outputs[0]);
@@ -572,7 +575,12 @@ void Lv2Pedalboard::ComputeVus(RealtimeVuBuffers *vuConfiguration, uint32_t samp
{
for (size_t i = 0; i < vuConfiguration->enabledIndexes.size(); ++i)
{
int index = vuConfiguration->enabledIndexes[i];
auto& rtIndex = vuConfiguration->enabledIndexes[i];
if (rtIndex.instanceType != this->pedalboardType)
{
continue;
}
int index = rtIndex.index;
VuUpdate *pUpdate = &vuConfiguration->vuUpdateWorkingData[i];
if (index == Pedalboard::START_CONTROL_ID)
{
@@ -1016,3 +1024,32 @@ void Lv2Pedalboard::handleTapTempo(uint8_t value, const MidiTimestamp& timestamp
mapping.lastTapTimestamp = timestamp;
}
}
size_t Lv2Pedalboard::GetNumberOfAudioInputChannels() const {
switch (pedalboardType)
{
case Pedalboard::PedalboardType::MainPedalboard:
return pHost->GetChannelSelection().mainInputChannels().size();
case Pedalboard::PedalboardType::MainInsert:
return pHost->GetChannelSelection().mainOutputChannels().size();
case Pedalboard::PedalboardType::AuxInsert:
return pHost->GetChannelSelection().auxInputChannels().size();
default:
throw std::runtime_error("Invalid argument");
}
}
size_t Lv2Pedalboard::GetNumberOfAudioOutputChannels() const {
switch (pedalboardType)
{
case Pedalboard::PedalboardType::MainPedalboard:
return pHost->GetChannelSelection().mainOutputChannels().size();
case Pedalboard::PedalboardType::MainInsert:
return pHost->GetChannelSelection().mainOutputChannels().size();
case Pedalboard::PedalboardType::AuxInsert:
return pHost->GetChannelSelection().auxOutputChannels().size();
default:
throw std::runtime_error("Invalid argument");
}
}
src/Lv2Pedalboard.hpp
+4
View File
@@ -51,6 +51,7 @@ namespace pipedal
class Lv2Pedalboard
{
private:
Pedalboard::PedalboardType pedalboardType;
IHost *pHost = nullptr;
size_t currentFrameOffset = 0;
DbDezipper inputVolume;
@@ -128,6 +129,9 @@ namespace pipedal
std::vector<IEffect *> &GetEffects() { return realtimeEffects; }
std::vector<std::shared_ptr<IEffect>> &GetSharedEffectList() { return effects; }
size_t GetNumberOfAudioInputChannels() const;
size_t GetNumberOfAudioOutputChannels() const;
int GetIndexOfInstanceId(uint64_t instanceId)
{
for (int i = 0; i < this->realtimeEffects.size(); ++i)
src/Pedalboard.cpp
+5 -5
View File
@@ -210,7 +210,7 @@ PedalboardItem Pedalboard::MakeSplit()
Pedalboard Pedalboard::MakeDefault(InstanceType instanceType)
Pedalboard Pedalboard::MakeDefault(PedalboardType instanceType)
{
// copy insanity. but it happens so rarely.
Pedalboard result;
@@ -510,17 +510,17 @@ Snapshot Pedalboard::MakeSnapshotFromCurrentSettings(const Pedalboard &previousP
}
Pedalboard::Pedalboard(InstanceType instanceType = InstanceType::MainPedalboard)
Pedalboard::Pedalboard(PedalboardType instanceType)
{
switch (instanceType)
{
case InstanceType::MainPedalboard:
case PedalboardType::MainPedalboard:
nextInstanceId_ = 0;
break;
case InstanceType::MainInsert:
case PedalboardType::MainInsert:
nextInstanceId_ = MAIN_INSERT_INSTANCE_BASE;;
break;
case InstanceType::AuxInsert:
case PedalboardType::AuxInsert:
nextInstanceId_ = AUX_INSERT_INSTANCE_BASE;;
break;
}
src/Pedalboard.hpp
+11 -10
View File
@@ -230,13 +230,14 @@ class Pedalboard {
int64_t selectedPlugin_ = -1;
static constexpr int64_t TWO_POWER_52 = 4503599627370496; // Maximum Javascript integer value.
static constexpr int64_t TWO_POWER_48 = 281474976710656; // Number of possible instance IDs for Main Pedalboards.
static constexpr int64_t MAX_INSTANCE_ID = TWO_POWER_48;
public:
enum class InstanceType {
enum class PedalboardType {
MainPedalboard,
MainInsert,
AuxInsert
@@ -253,25 +254,25 @@ public:
static constexpr int64_t AUX_INSERT_START_CONTROL_ID = AUX_INSERT_INSTANCE_BASE + MAX_INSTANCE_ID -2;
static constexpr int64_t AUX_INSERT_END_CONTROL_ID = AUX_INSERT_INSTANCE_BASE + MAX_INSTANCE_ID -3;
static InstanceType GetInstanceTypeFromInstanceId(int64_t instanceId) {
if (instanceId == START_CONTROL_ID) return InstanceType::MainPedalboard;
if (instanceId == END_CONTROL_ID) return InstanceType::MainPedalboard;
static PedalboardType GetInstanceTypeFromInstanceId(int64_t instanceId) {
if (instanceId == START_CONTROL_ID) return PedalboardType::MainPedalboard;
if (instanceId == END_CONTROL_ID) return PedalboardType::MainPedalboard;
if (instanceId >= MAIN_INSERT_INSTANCE_BASE) {
return InstanceType::MainInsert;
return PedalboardType::MainInsert;
} else if (instanceId >= AUX_INSERT_INSTANCE_BASE) {
return InstanceType::AuxInsert;
return PedalboardType::AuxInsert;
} else {
return InstanceType::MainPedalboard;
return PedalboardType::MainPedalboard;
}
}
InstanceType GetInstanceType() const {
PedalboardType GetInstanceType() const {
return GetInstanceTypeFromInstanceId(this->nextInstanceId_); // instanceId is irrelevant here.
}
Pedalboard(InstanceType instanceType = InstanceType::MainPedalboard);
Pedalboard(PedalboardType instanceType = PedalboardType::MainPedalboard);
// deep copy, breaking shared pointers.
Pedalboard DeepCopy();
@@ -307,7 +308,7 @@ public:
PedalboardItem MakeSplit();
static Pedalboard MakeDefault(Pedalboard::InstanceType instanceType);
static Pedalboard MakeDefault(Pedalboard::PedalboardType instanceType = Pedalboard::PedalboardType::MainPedalboard);
};
#undef GETTER_SETTER_REF
src/PiLatencyMain.cpp
+18 -10
View File
@@ -34,6 +34,7 @@
#include <chrono>
#include <thread>
#include <sched.h>
#include "ChannelRouterSettings.hpp"
using namespace pipedal;
@@ -169,19 +170,26 @@ public:
delete[] inputBuffers;
delete[] outputBuffers;
}
std::vector<std::string> SelectChannels(const std::vector<std::string> &available, const std::vector<int> &selection)
std::vector<int64_t> SelectChannels(const std::vector<std::string> &available, const std::vector<int> &selection)
{
std::vector<int64_t> result;
if (selection.size() == 0)
return available;
{
result.resize(available.size());
for (size_t i = 0; i < result.size(); ++i)
{
result[i] = (int64_t)i;
}
return result;
}
std::vector<std::string> result;
for (int sel : selection)
{
if (sel < 0 || sel >= available.size())
{
throw PiPedalArgumentException(SS("Invalid channel: " + sel));
}
result.push_back(available[sel]);
result.push_back(sel);
}
return result;
}
@@ -199,22 +207,22 @@ public:
auto &availableInputs = jackConfiguration.inputAudioPorts();
auto &availableOutputs = jackConfiguration.outputAudioPorts();
std::vector<std::string> inputAudioPorts, outputAudioPorts;
std::vector<int64_t> inputAudioPorts, outputAudioPorts;
inputAudioPorts = SelectChannels(availableInputs, this->inputChannels);
outputAudioPorts = SelectChannels(availableOutputs, this->outputChannels);
JackChannelSelection channelSelection(
inputAudioPorts, outputAudioPorts,
std::vector<AlsaMidiDeviceInfo>());
ChannelSelection channelSelection;
channelSelection.mainInputChannels() = inputAudioPorts;
channelSelection.mainOutputChannels() = outputAudioPorts;
audioDriver = CreateAlsaDriver(this);
latencyMonitor.Init(jackConfiguration.sampleRate());
audioDriver->Open(serverSettings, channelSelection);
inputBuffers = new float *[channelSelection.GetInputAudioPorts().size()];
outputBuffers = new float *[channelSelection.GetOutputAudioPorts().size()];
inputBuffers = new float *[channelSelection.mainInputChannels().size()];
outputBuffers = new float *[channelSelection.mainOutputChannels().size()];
audioDriver->Activate();
src/PiPedalModel.cpp
+14 -8
View File
@@ -81,7 +81,7 @@ PiPedalModel::PiPedalModel()
this->updater = Updater::Create();
this->updater->Start();
this->currentUpdateStatus = updater->GetCurrentStatus();
this->pedalboard = Pedalboard::MakeDefault(Pedalboard::InstanceType::MainPedalboard);
this->pedalboard = Pedalboard::MakeDefault(Pedalboard::PedalboardType::MainPedalboard);
#if JACK_HOST
this->jackServerSettings = this->storage.GetJackServerSettings(); // to get onboarding flag.
this->jackServerSettings.ReadJackDaemonConfiguration();
@@ -216,14 +216,20 @@ void PiPedalModel::Init(const PiPedalConfiguration &configuration)
storage.Initialize();
pluginHost.SetPluginStoragePath(storage.GetPluginUploadDirectory());
this->channelRouterSettings = storage.GetChannelRouterSettings();
this->systemMidiBindings = storage.GetSystemMidiBindings();
#if JACK_HOST
this->jackConfiguration = this->jackConfiguration.JackInitialize();
#else
this->jackServerSettings = storage.GetJackServerSettings();
this->jackConfiguration.AlsaInitialize(jackServerSettings);
#endif
this->channelRouterSettings = storage.GetChannelRouterSettings();
pluginHost.OnConfigurationChanged(
jackConfiguration,
storage.GetChannelSelection());
}
void PiPedalModel::LoadLv2PluginInfo()
@@ -299,7 +305,7 @@ void PiPedalModel::Load()
if (CrashGuard::HasCrashed())
{
// ignore the current preset, and load a blank pedalboard in order to avoid a potential plugin crash.
this->pedalboard = Pedalboard::MakeDefault(Pedalboard::InstanceType::MainPedalboard);
this->pedalboard = Pedalboard::MakeDefault(Pedalboard::PedalboardType::MainPedalboard);
}
else
{
@@ -1429,7 +1435,7 @@ void PiPedalModel::RestartAudio(bool useDummyAudioDriver)
this->pluginHost.OnConfigurationChanged(jackConfiguration, channelSelection);
FireChannelSelectionChanged(-1);
FireChannelRouterSettingsChanged(-1);
LoadCurrentPedalboard();
this->UpdateRealtimeVuSubscriptions();
@@ -1526,17 +1532,17 @@ std::vector<AlsaSequencerPortSelection> PiPedalModel::GetAlsaSequencerPorts()
}
void PiPedalModel::FireChannelSelectionChanged(int64_t clientId)
void PiPedalModel::FireChannelRouterSettingsChanged(int64_t clientId)
{
std::lock_guard<std::recursive_mutex> guard{mutex};
{
// take a snapshot incase a client unsusbscribes in the notification handler (in which case the mutex won't protect us)
JackChannelSelection channelSelection = storage.GetJackChannelSelection(this->jackConfiguration);
ChannelRouterSettings::ptr channelRouterSettings = this->channelRouterSettings;
std::vector<IPiPedalModelSubscriber::ptr> t{subscribers.begin(), subscribers.end()};
for (auto &subscriber : t)
{
subscriber->OnChannelSelectionChanged(clientId, channelSelection);
subscriber->OnChannelRouterSettingsChanged(clientId, *channelRouterSettings);
}
}
}
@@ -3331,7 +3337,7 @@ void PiPedalModel::SetChannelRouterSettings(int64_t clientId,ChannelRouterSettin
}
RestartAudio(); // no lock to avoid mutex deadlock when reader thread is sending notifications..
this->FireChannelSelectionChanged(clientId);
this->FireChannelRouterSettingsChanged(clientId);
}
src/PiPedalModel.hpp
+2 -2
View File
@@ -73,7 +73,7 @@ namespace pipedal
virtual void OnSnapshotModified(int64_t selectedSnapshot, bool modified) = 0;
virtual void OnSelectedSnapshotChanged(int64_t selectedSnapshot) = 0;
virtual void OnPluginPresetsChanged(const std::string &pluginUri) = 0;
virtual void OnChannelSelectionChanged(int64_t clientId, const JackChannelSelection &channelSelection) = 0;
virtual void OnChannelRouterSettingsChanged(int64_t clientId, const ChannelRouterSettings &channelRouterSettings) = 0;
virtual void OnVuMeterUpdate(const std::vector<VuUpdate> &updates) = 0;
virtual void OnBankIndexChanged(const BankIndex &bankIndex) = 0;
virtual void OnJackServerSettingsChanged(const JackServerSettings &jackServerSettings) = 0;
@@ -206,7 +206,7 @@ namespace pipedal
void FirePresetChanged(bool changed);
void FirePluginPresetsChanged(const std::string &pluginUri);
void FirePedalboardChanged(int64_t clientId, bool reloadAudioThread = true);
void FireChannelSelectionChanged(int64_t clientId);
void FireChannelRouterSettingsChanged(int64_t clientId);
void FireBanksChanged(int64_t clientId);
void FireJackConfigurationChanged(const JackConfiguration &jackConfiguration);
void FireLv2StateChanged(int64_t instanceId, const Lv2PluginState &lv2State);
src/PiPedalSocket.cpp
+16 -11
View File
@@ -537,17 +537,24 @@ JSON_MAP_REFERENCE(SnapshotModifiedBody, snapshotIndex)
JSON_MAP_REFERENCE(SnapshotModifiedBody, modified)
JSON_MAP_END()
class ChannelSelectionChangedBody
class ChannelRouterSettingsChangedBody
{
public:
int64_t clientId_ = -1;
JackChannelSelection *jackChannelSelection_ = nullptr;
ChannelRouterSettingsChangedBody(
int64_t clientId,
const ChannelRouterSettings &channelRouterSettings
): clientId_(clientId), channelRouterSettings_(channelRouterSettings)
{
DECLARE_JSON_MAP(ChannelSelectionChangedBody);
}
int64_t clientId_ = -1;
ChannelRouterSettings channelRouterSettings_;
DECLARE_JSON_MAP(ChannelRouterSettingsChangedBody);
};
JSON_MAP_BEGIN(ChannelSelectionChangedBody)
JSON_MAP_REFERENCE(ChannelSelectionChangedBody, clientId)
JSON_MAP_REFERENCE(ChannelSelectionChangedBody, jackChannelSelection)
JSON_MAP_BEGIN(ChannelRouterSettingsChangedBody)
JSON_MAP_REFERENCE(ChannelRouterSettingsChangedBody, clientId)
JSON_MAP_REFERENCE(ChannelRouterSettingsChangedBody, channelRouterSettings)
JSON_MAP_END()
class PresetsChangedBody
@@ -2000,11 +2007,9 @@ private:
Send("onShowStatusMonitorChanged", show);
}
virtual void OnChannelSelectionChanged(int64_t clientId, const JackChannelSelection &channelSelection)
virtual void OnChannelRouterSettingsChanged(int64_t clientId, const ChannelRouterSettings &channelRouterSettings)
{
ChannelSelectionChangedBody body;
body.clientId_ = clientId;
body.jackChannelSelection_ = const_cast<JackChannelSelection *>(&channelSelection);
ChannelRouterSettingsChangedBody body(clientId, channelRouterSettings);
Send("onChannelSelectionChanged", body);
}
src/RingBufferReader.hpp
+5 -5
View File
@@ -98,20 +98,20 @@ namespace pipedal
struct RealtimePedalboardItemIndex {
RealtimePedalboardItemIndex()
: instanceType(Pedalboard::InstanceType::MainPedalboard), index(-1)
: instanceType(Pedalboard::PedalboardType::MainPedalboard), index(-1)
{
}
RealtimePedalboardItemIndex(
Pedalboard::InstanceType instanceType,
int index)
Pedalboard::PedalboardType instanceType,
int64_t index)
: instanceType(instanceType), index(index)
{
}
RealtimePedalboardItemIndex(const RealtimePedalboardItemIndex& other) = default;
RealtimePedalboardItemIndex& operator=(const RealtimePedalboardItemIndex& other) = default;
Pedalboard::InstanceType instanceType = Pedalboard::InstanceType::MainPedalboard;
int index = -1;
Pedalboard::PedalboardType instanceType = Pedalboard::PedalboardType::MainPedalboard;
int64_t index = -1;
};
struct RealtimeMidiEventRequest
src/StateInterface.hpp
+1 -2
View File
@@ -19,13 +19,12 @@
#pragma once
#include "lilv/lilv.h"
#include "lv2/state/state.h"
#include <cstddef>
#include "json_variant.hpp"
#include "MapFeature.hpp"
#include "IHost.hpp"
#include "lilv/lilv.h"
#include <lilv/lilv.h>
namespace pipedal
{
src/Storage.cpp
+4 -3
View File
@@ -377,7 +377,7 @@ void Storage::Initialize()
LoadTone3000Auth();
try
{
LoadChannelSelection();
LoadJackChannelSelection();
}
catch (const std::exception &)
{
@@ -476,7 +476,7 @@ void Storage::LoadBankIndex()
if (bankIndex.entries().size() == 0)
{
currentBank.clear();
Pedalboard defaultPedalboard = Pedalboard::MakeDefault();
Pedalboard defaultPedalboard = Pedalboard::MakeDefault(Pedalboard::PedalboardType::MainPedalboard);
int64_t instanceId = currentBank.addPreset(defaultPedalboard);
currentBank.selectedPreset(instanceId);
@@ -1135,7 +1135,7 @@ AlsaSequencerConfiguration Storage::GetAlsaSequencerConfiguration() const
return this->alsaSequencerConfiguration;
}
void Storage::LoadChannelSelection()
void Storage::LoadJackChannelSelection()
{
auto fileName = this->GetChannelSelectionFileName();
if (std::filesystem::exists(fileName))
@@ -3102,6 +3102,7 @@ ChannelRouterSettings::ptr Storage::LoadChannelRouterSettings()
json_reader reader(is);
ChannelRouterSettings::ptr result;
reader.read(&result);
this->channelSelection = ChannelSelection(*result);
return result;
} catch (const std::exception &e) {
Lv2Log::error("Failed to load Channel Router settings: %s", e.what());
src/Storage.hpp
+1 -1
View File
@@ -100,7 +100,7 @@ private:
void LoadCurrentBank();
void SaveCurrentBank();
void LoadChannelSelection();
void LoadJackChannelSelection();
void SaveChannelSelection();
void LoadAlsaSequencerConfiguration();