Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/workflows/logical-mixer-fast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
paths:
- 'engine/core/DeviceIndependentMixerSession.h'
- 'engine/core/DynamicChannelRoster.h'
- 'engine/core/DynamicPreparedMixerBlock.h'
- 'engine/core/DynamicAcceptedSession.h'
- 'engine/core/DynamicNativeSessionPublisher.h'
- 'tests/dynamic_accepted_session_test.cpp'
- 'tests/device_independent_mixer_session_test.cpp'
- '.github/workflows/logical-mixer-fast.yml'
workflow_dispatch:
Expand All @@ -19,3 +23,9 @@ jobs:
tests/device_independent_mixer_session_test.cpp \
-o /tmp/arsonmix-logical-test
/tmp/arsonmix-logical-test
- name: Compile and run native PCM gain, PRE/POST and SEND regressions (no JUCE)
run: |
c++ -std=c++20 -O1 -Wall -Wextra -Werror -I. \
tests/dynamic_accepted_session_test.cpp \
-o /tmp/arsonmix-dynamic-pcm-test
/tmp/arsonmix-dynamic-pcm-test
22 changes: 22 additions & 0 deletions engine/core/DynamicAcceptedSession.h
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,14 @@ class DynamicAcceptedSession final {
return false;
return accepted_.rememberLiveMix(id,linear,pan);
}
// Pre-insert, pre-fader digital input gain; a real ChannelId PCM target.
bool setLiveInputGain(std::uint64_t epoch,std::uint64_t graphRevision,
ChannelId id,float linear) noexcept {
const auto* row=accepted_.find(id);
if(!row || row->role!=ChannelRole::input ||
!publisher_.setChannelInputGain(epoch,graphRevision,id,linear))return false;
return accepted_.rememberLiveInputGain(id,linear);
}
// The accepted physical patch is canonical too: subsequent Group/FX
// graph recompiles must preserve the most recently ACKed live SOURCE.
bool setLivePhysicalSource(std::uint64_t epoch,std::uint64_t graphRevision,
Expand Down Expand Up @@ -350,6 +358,20 @@ class DynamicAcceptedSession final {
source,destination,preFader,linear);
}

// The exact existing parallel EdgeId is toggled without deleting its
// connection, changing the source's primary OUT, or recompiling the graph.
bool setLiveSendEnabled(std::uint64_t epoch,std::uint64_t graphRevision,
ChannelId source,std::uint64_t edgeId,bool enabled) noexcept {
const auto* row=accepted_.find(source);
if(!row || !edgeId)return false;
for(const auto& edge:row->sends)
if(edge.edgeId==edgeId && !edge.primaryOutput){
if(!publisher_.setWireEnabled(epoch,graphRevision,source,edgeId,enabled))
return false;
return accepted_.rememberLiveSendEnabled(source,edgeId,enabled);
}
return false;
}
bool setLiveWireGain(std::uint64_t epoch,std::uint64_t revision,
ChannelId source,std::uint64_t edgeId,float gain) noexcept {
const auto* row=accepted_.find(source);
Expand Down
16 changes: 15 additions & 1 deletion engine/core/DynamicChannelRoster.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ struct ChannelEdit final {
// Control-document metadata (rack/slot bypass) changes revision
// without changing a fader, audio descriptor or live PCM topology.
touchDocumentRevision,
setInputGain
setInputGain, setSendEnabled, setSendTap
} kind=Kind::add;
ChannelId id{}; // existing channel (except add)
ChannelId target{}; // send destination
Expand All @@ -81,6 +81,7 @@ struct ChannelEdit final {
bool primaryOutput=false; // exclusive OUT edge, independent of parallel SEND
bool connectMainOnCreate=false; // WIRE-first native creation; legacy imports unchanged
float sendPan=0.f; // independent send PAN, never channel fader PAN
std::uint64_t sendEdgeId=0; // exact existing parallel EdgeId
std::string text;
};
struct ChannelEditResult final {
Expand Down Expand Up @@ -268,6 +269,19 @@ class DynamicChannelRoster final {
case ChannelEdit::Kind::setSolo:
it->solo=op.enabled;
break;
case ChannelEdit::Kind::setSendEnabled:
case ChannelEdit::Kind::setSendTap: {
const auto edge=std::find_if(it->sends.begin(),it->sends.end(),
[&](const auto& send){return send.edgeId==op.sendEdgeId;});
if(!op.sendEdgeId || edge==it->sends.end())
result.fault=ChannelEditFault::missingEdge;
else if(edge->primaryOutput)
result.fault=ChannelEditFault::invalidAction;
else if(op.kind==ChannelEdit::Kind::setSendEnabled)
edge->enabled=op.enabled;
else edge->preFader=op.preFader; // post-FX PRE, not PRE_FX
break;
}
case ChannelEdit::Kind::touchDocumentRevision:
// Exact stable ChannelId is validated above. Bump the
// document revision without fabricating a DSP parameter
Expand Down
28 changes: 28 additions & 0 deletions src/NativeLogicalMixerWorkspace.h
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,29 @@ class NativeLogicalMixerWorkspace final {
edit.value=static_cast<float>(n);
}
result=editor_.edit(expected,std::span<const ChannelEdit>{&edit,1});
} else if(operation=="SET_SEND_TAP") {
const auto raw=payload.getProperty("edgeId",{});
std::uint64_t edgeId=0;
if(!armix::session::parseDecimal(raw,edgeId)||!edgeId)
return bad("INVALID_SEND_TAP_EDGE");
const auto tap=payload.getProperty("tap","").toString();
if(tap!="PRE_FADER" && tap!="POST_FADER")
return bad("INVALID_SEND_TAP_STAGE");
edit.kind=ChannelEdit::Kind::setSendTap;
edit.sendEdgeId=edgeId;
edit.preFader=tap=="PRE_FADER";
result=editor_.edit(expected,std::span<const ChannelEdit>{&edit,1});
} else if(operation=="SET_SEND_ENABLED") {
// Document-only operation: never impersonate installed ASIO PCM.
const auto raw=payload.getProperty("edgeId",{});
const auto enabled=payload.getProperty("enabled",{});
std::uint64_t edgeId=0;
if(!armix::session::parseDecimal(raw,edgeId)||!edgeId||
!enabled.isBool())return bad("INVALID_SEND_ENABLED");
edit.kind=ChannelEdit::Kind::setSendEnabled;
edit.sendEdgeId=edgeId;
edit.enabled=static_cast<bool>(enabled);
result=editor_.edit(expected,std::span<const ChannelEdit>{&edit,1});
} else if(operation=="SET_MUTE" || operation=="SET_SOLO") {
if(!number.isBool())return bad("INVALID_BOOLEAN_CONTROL");
edit.kind=operation=="SET_MUTE"?
Expand Down Expand Up @@ -351,6 +374,7 @@ class NativeLogicalMixerWorkspace final {
for(const char* op:{"CREATE_CHANNEL","DELETE_CHANNEL","CREATE_GROUP",
"REMOVE_BUS","RENAME_CHANNEL","SET_FADER","SET_INPUT_GAIN","SET_PAN","SET_MUTE",
"SET_SOLO","SET_PROCESSING_FORMAT","WIRE_TRANSACTION",
"SET_SEND_ENABLED","SET_SEND_TAP",
"ADD_FX_REFERENCE","REMOVE_FX_REFERENCE",
"SET_FX_SLOT_BYPASS","SET_FX_RACK_BYPASS"})operations.add(juce::String(op));
set(cap,"supportedOps",juce::var(operations));
Expand Down Expand Up @@ -406,9 +430,13 @@ class NativeLogicalMixerWorkspace final {
set(edge,"from",str(row.id.value));
set(edge,"to",str(send.destination.value));
set(edge,"signalKind","AUDIO");set(edge,"enabled",true);
// The wire remains present; SEND ON is an independent audio gate.
set(edge,"sendEnabled",send.enabled);
set(edge,"gainLinear",static_cast<double>(send.gain));
set(edge,"primaryOutput",send.primaryOutput);
set(edge,"tap",send.preFader?"SPLIT_PRE":"POST_FADER");
// Never confuse the modern post-FX PRE_FADER tap with PRE_FX.
set(edge,"tapStage",send.preFader?"PRE_FADER":"POST_FADER");
edges.add(edge);
sends.add(edge);
if(send.primaryOutput)set(channel,"primaryOutId",str(send.destination.value));
Expand Down
41 changes: 40 additions & 1 deletion tests/device_independent_mixer_session_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,41 @@ int main() {
valid(track->sends.back().destination==stableMain &&
!track->sends.back().primaryOutput);

// SEND ON/OFF is a state of the exact parallel EdgeId, NOT removal.
// Primary OUT and a different edge may not be touched accidentally.
const auto sendEdge=track->sends.back().edgeId;
ChannelEdit off;off.kind=ChannelEdit::Kind::setSendEnabled;
off.id=backing;off.sendEdgeId=sendEdge;off.enabled=false;
auto toggled=logical.edit(logical.revision(),
std::span<const ChannelEdit>{&off,1});
valid(toggled.accepted());
track=logical.roster().find(backing);
valid(track->sends.size()==2 && !track->sends.back().enabled &&
track->sends.back().gain==.25f &&
track->sends.back().edgeId==sendEdge &&
track->sends.front().primaryOutput && track->sends.front().enabled);
const auto revisionAfterOff=logical.revision();
valid(!logical.edit(revisionAfterOff-1,
std::span<const ChannelEdit>{&off,1}).accepted());
ChannelEdit wrong=off;wrong.sendEdgeId=serialEdge;
valid(!logical.edit(logical.revision(),
std::span<const ChannelEdit>{&wrong,1}).accepted());
wrong.sendEdgeId=99999999;
valid(!logical.edit(logical.revision(),
std::span<const ChannelEdit>{&wrong,1}).accepted());
valid(!logical.roster().find(backing)->sends.back().enabled);
// Restore retains disabled SEND identity and parameters without hardware.
DeviceIndependentMixerSession switched;
valid(switched.restore(logical.roster()));
const auto* swapped=switched.roster().find(backing);
valid(swapped && !swapped->sends.back().enabled &&
swapped->sends.back().gain==.25f && swapped->sends.back().edgeId==sendEdge);
ChannelEdit on=off;on.enabled=true;
valid(logical.edit(logical.revision(),
std::span<const ChannelEdit>{&on,1}).accepted());
valid(logical.roster().find(backing)->sends.back().enabled &&
logical.roster().find(backing)->sends.back().edgeId==sendEdge);

// 4) SOURCE ONLY removes primary MAIN but leaves the strip and
// its explicit parallel SEND. Removing the last send keeps the channel.
ChannelEdit sourceOnly;
Expand Down Expand Up @@ -124,6 +159,9 @@ int main() {
ChannelEdit gain;gain.kind=ChannelEdit::Kind::setFader;
gain.id=backing;gain.value=.5f;
settings.push_back(gain);
ChannelEdit trim;trim.kind=ChannelEdit::Kind::setInputGain;
trim.id=backing;trim.value=2.f;
settings.push_back(trim);
ChannelEdit pan;pan.kind=ChannelEdit::Kind::setPan;
pan.id=backing;pan.value=-.2f;
settings.push_back(pan);
Expand Down Expand Up @@ -157,7 +195,8 @@ int main() {
const auto* row=restored.roster().find(backing);
valid(row && row->format==ProcessingFormat::mono &&
std::abs(row->faderLinear-.5f)<1.e-6f &&
std::abs(row->pan+.2f)<1.e-6f && row->mute && row->solo &&
std::abs(row->pan+.2f)<1.e-6f && row->inputGainLinear==2.f &&
row->mute && row->solo &&
row->insertCatalogIds.size()==1 &&
row->insertCatalogIds.front()=="armix.builtin.channel-compressor.v1");

Expand Down
167 changes: 167 additions & 0 deletions tests/dynamic_accepted_session_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,171 @@ static ChannelEdit send(ChannelId from,ChannelId to,float gain,bool pre=false) {
e.id=from;e.target=to;e.value=gain;e.preFader=pre;return e;
}

// Real PCM SEND ON/OFF: mute one parallel edge without deleting the cable,
// changing its gain/tap, or affecting the source channel's MAIN contribution.
static void verifyPerEdgeSendEnablePcm() {
constexpr std::uint64_t epoch=9422;
DynamicAcceptedSession session;
DynamicGraphRequest req;req.physicalInputs=1;req.maxFrames=64;
const std::array<ChannelEdit,3> channels{
add(0,ChannelRole::input,"VOICE"),
add(1,ChannelRole::fxReturn,"WET",ProcessingFormat::stereo),
add(2,ChannelRole::main,"MAIN",ProcessingFormat::stereo)
};
auto a=session.edit(0,0,channels,req,epoch,epoch,true);
assert(a.ok());
const auto voice=a.edit.createdIds[0];
const auto wet=a.edit.createdIds[1];
const auto main=a.edit.createdIds[2];
const std::array<ChannelEdit,3> links{
output(voice,main),output(wet,main),send(voice,wet,.5f,true)
};
req.sources={{voice,0,-1,false}};
a=session.edit(1,1,links,req,epoch,epoch,true);
assert(a.ok());
const auto* row=session.acceptedRoster().find(voice);
assert(row && row->sends.size()==2);
const auto edge=std::find_if(row->sends.begin(),row->sends.end(),
[&](const auto& e){return e.destination==wet && !e.primaryOutput;});
assert(edge!=row->sends.end() && edge->enabled);
const auto edgeId=edge->edgeId;
std::array<float,64> input{},l{},r{};input.fill(.5f);
const float* pins[]{input.data()};
const auto fx=+[](ChannelId,float*,float*,int) noexcept {};
const auto render=[&](int frames=64){
return session.render(epoch,pins,1,l.data(),r.data(),frames,false,fx);
};
assert(render());
const float withSend=l[63];
assert(withSend>.35f);
ChannelEdit off;off.kind=ChannelEdit::Kind::setSendEnabled;
off.id=voice;off.sendEdgeId=edgeId;off.enabled=false;
const std::array<ChannelEdit,1> disable{off};
a=session.edit(2,2,disable,req,epoch,epoch,true);
assert(a.ok() && a.graphRevision==3);
row=session.acceptedRoster().find(voice);
const auto offEdge=std::find_if(row->sends.begin(),row->sends.end(),
[&](const auto& e){return e.edgeId==edgeId;});
assert(offEdge!=row->sends.end() && !offEdge->enabled &&
offEdge->gain==.5f && offEdge->preFader);
// Disabled SEND stores its prior gain; no accidental auto-enable.
assert(session.acceptedRoster().find(voice)->sends.back().gain==.5f);
assert(render());
const float withoutSend=l[63];
assert(withoutSend>.1f && withoutSend<withSend);
auto on=off;on.enabled=true;
const std::array<ChannelEdit,1> enable{on};
a=session.edit(3,3,enable,req,epoch,epoch,true);
assert(a.ok() && a.graphRevision==4);
row=session.acceptedRoster().find(voice);
const auto onEdge=std::find_if(row->sends.begin(),row->sends.end(),
[&](const auto& e){return e.edgeId==edgeId;});
assert(onEdge!=row->sends.end() && onEdge->enabled &&
onEdge->gain==.5f && onEdge->preFader);
assert(render() && near(l[63],withSend,1e-4f));
// Toggle the same EdgeId LIVE without a graph revision or WIRE removal.
assert(!session.setLiveSendEnabled(epoch-1,4,voice,edgeId,false));
assert(!session.setLiveSendEnabled(epoch,3,voice,edgeId,false));
assert(session.setLiveSendEnabled(epoch,4,voice,edgeId,false));
assert(session.acceptedGraphRevision()==4);
assert(!session.acceptedRoster().find(voice)->sends.back().enabled);
const auto* accepted=session.acceptedRouting(epoch,4);
assert(accepted);
const auto routingEdge=std::find_if(accepted->edges.begin(),accepted->edges.end(),
[&](const auto& e){return e.edgeId==edgeId;});
assert(routingEdge!=accepted->edges.end() && !routingEdge->enabled);
// Disabled SEND stores its prior gain; no accidental auto-enable.
assert(session.acceptedRoster().find(voice)->sends.back().gain==.5f);
assert(render(4));
const float liveOff=l[3];
assert(liveOff>withoutSend && liveOff<withSend);
assert(render(60) && near(l[59],withoutSend,1e-4f));
assert(session.setLiveSendEnabled(epoch,4,voice,edgeId,true));
assert(session.acceptedRoster().find(voice)->sends.back().enabled);
assert(render(4) && l[3]>withoutSend && l[3]<withSend);
assert(render(60) && near(l[59],withSend,1e-4f));
assert(session.acceptedGraphRevision()==4);
// PRE_FADER is AFTER FX and BEFORE the source channel fader.
// With source fader fully closed, wet PRE remains; POST must go silent.
assert(session.setLiveMix(epoch,4,voice,0.f,0.f));
assert(render());
const float truePre=l[63];
assert(truePre>.01f && truePre<withSend);
ChannelEdit retap;retap.kind=ChannelEdit::Kind::setSendTap;
retap.id=voice;retap.sendEdgeId=edgeId;retap.preFader=false;
const std::array<ChannelEdit,1> post{retap};
a=session.edit(4,4,post,req,epoch,epoch,true);
assert(a.ok() && a.graphRevision==5);
row=session.acceptedRoster().find(voice);
const auto moved=std::find_if(row->sends.begin(),row->sends.end(),
[&](const auto& e){return e.edgeId==edgeId;});
assert(moved!=row->sends.end() && !moved->preFader &&
moved->enabled && moved->gain==.5f);
assert(render() && near(l[63],0.f,1e-5f));
// Reject primary tap edits and keep the accepted revision/audio intact.
const auto primary=std::find_if(row->sends.begin(),row->sends.end(),
[&](const auto& e){return e.primaryOutput;});
assert(primary!=row->sends.end());
retap.sendEdgeId=primary->edgeId;retap.preFader=true;
const std::array<ChannelEdit,1> illegal{retap};
a=session.edit(5,5,illegal,req,epoch,epoch,true);
assert(!a.ok() && session.acceptedGraphRevision()==5);
assert(render() && near(l[63],0.f,1e-5f));
session.unpublish();session.pollRetirement();
}

// Digital input trim must precede nonlinear FX, with callback-continuous
// sample smoothing and a stable ChannelId during live parameter changes.
static void verifyDigitalInputGainBeforeFxPcm() {
constexpr std::uint64_t epoch=9442;
DynamicAcceptedSession session;
DynamicGraphRequest req;req.physicalInputs=1;req.maxFrames=64;
const std::array<ChannelEdit,2> setup{
add(0,ChannelRole::input,"MIC"),
add(1,ChannelRole::main,"MAIN",ProcessingFormat::stereo)
};
auto a=session.edit(0,0,setup,req,epoch,epoch,true);
assert(a.ok());
const auto mic=a.edit.createdIds[0];
const auto main=a.edit.createdIds[1];
const std::array<ChannelEdit,1> link{output(mic,main)};
req.sources={{mic,0,-1,false}};
a=session.edit(1,1,link,req,epoch,epoch,true);
assert(a.ok());
std::array<float,64> input{},l{},r{};input.fill(.25f);
const float* pins[]{input.data()};
const auto square=[&](ChannelId ch,float* left,float* right,int n) noexcept {
if(ch!=mic)return;
for(int i=0;i<n;++i){left[i]*=left[i];right[i]*=right[i];}
};
const auto render=[&](int frames){
return session.render(epoch,pins,1,l.data(),r.data(),frames,false,square);
};
assert(render(64));
const float original=l[63];
assert(near(original,.25f*.25f*.70710678f,1e-4f));
assert(!session.setLiveInputGain(epoch-1,2,mic,2.f));
assert(!session.setLiveInputGain(epoch,1,mic,2.f));
assert(!session.setLiveInputGain(epoch,2,main,2.f));
assert(!session.setLiveInputGain(epoch,2,mic,17.f));
assert(session.setLiveInputGain(epoch,2,mic,2.f));
assert(session.acceptedRoster().find(mic)->inputGainLinear==2.f);
assert(render(4));
assert(l[3]>original && l[3]<original*4.f);
assert(render(60));
// Gain x2 BEFORE square-law FX gives x4 PCM, not x2 (post-FX bug).
assert(near(l[59],original*4.f,1e-4f));
// A subsequent graph edit must preserve the accepted input gain.
ChannelEdit rename;rename.kind=ChannelEdit::Kind::rename;
rename.id=mic;rename.text="MIC NEW NAME";
const std::array<ChannelEdit,1> change{rename};
a=session.edit(2,2,change,req,epoch,epoch,true);
assert(a.ok() && session.acceptedRoster().find(mic)->inputGainLinear==2.f);
assert(render(64));
assert(near(l[63],original*4.f,1e-4f));
session.unpublish();session.pollRetirement();
}

static void verifyRealtimeSlewAndNativeChannelIdContinuousControls() {
using armix::dsp::RealtimeSlew64;
// Sub-64 variable callbacks must not finish a 64-sample gesture in 4
Expand Down Expand Up @@ -919,6 +1084,8 @@ int main() {

verifyConsoleWirePrimaryOutputPcm();
verifyRealtimeSlewAndNativeChannelIdContinuousControls();
verifyPerEdgeSendEnablePcm();
verifyDigitalInputGainBeforeFxPcm();
constexpr std::uint64_t epoch=77;
constexpr float center=.7071067811865475f;
DynamicAcceptedSession session;
Expand Down
Loading