Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
795cb26
O1 native PCM: add lock-free post-fader physical taps and prepared PD…
masarray Nov 11, 2026
61ca9ca
O1 publisher: pass hardware taps through authoritative PCM callback
masarray Nov 11, 2026
4a79987
O1 device: attest exact labeled ASIO output pin inventory
masarray Nov 11, 2026
2e863fd
O1 .smix: persist validated stable-ChannelId physical output intent a…
masarray Nov 11, 2026
0db4ca3
O1 native control: validate sparse labeled ASIO pairs, preserve WIRE,…
masarray Nov 11, 2026
50bbf4d
O1 JUCE callback: render and retain independent output PCM on real AS…
masarray Nov 11, 2026
eead661
fix(o1): store JUCE var output assignment without invalid pointer rel…
masarray Nov 11, 2026
38b5abe
O1 engine host: verify exact ASIO device and dispatch external PCM ta…
masarray Nov 11, 2026
d8f3a3f
O1 native intent: validated external output transaction ACK and indep…
masarray Nov 11, 2026
e786aaf
O1 approved /preview/: separate compact internal WIRE and physical Ex…
masarray Nov 11, 2026
15ca613
O1 strip geometry: compact third output row with pending and remap vi…
masarray Nov 11, 2026
c31c6ef
O1 approved native GUI assembly: wire EXTERNAL selector to same live …
masarray Nov 11, 2026
0662005
O1 readback: expose accepted native graph revision and reserved hardw…
masarray Nov 11, 2026
d375305
O1 approved native GUI: ASIO physical pair options and installed LIVE…
masarray Nov 11, 2026
988b66f
O1 approved native EXTERNAL OUT: typed gesture, amplifier confirmatio…
masarray Nov 11, 2026
709ab63
O2 deterministic PCM tests: isolated BUS outputs, source only, native…
masarray Nov 11, 2026
b3e7caa
O2 CI: include deterministic physical output CTest in existing Window…
masarray Nov 11, 2026
4c96dce
fix(o1): optional DOM dataset in lightweight native contract harness
masarray Nov 11, 2026
6bfe734
O1: preserve immutable public Pages/V28 UI; insert native-only EXT co…
masarray Nov 11, 2026
7d7b6a2
O1: preserve immutable public Pages/V28 UI; insert native-only EXT co…
masarray Nov 11, 2026
8e96a7e
O1 native-only approved Pages assembly: compact EXT row without publi…
masarray Nov 11, 2026
539ee0d
O1 DSP: align all physical buses in PDC and publish callback-applied …
masarray Nov 11, 2026
2b92dfa
O1 publisher: return physical tap identity actually applied by audio …
masarray Nov 11, 2026
e71ce61
O1 native readback: LIVE only after real PCM callback applied externa…
masarray Nov 11, 2026
8036aa4
O1 native UI: distinguish pending callback PCM from stale hardware NE…
masarray Nov 11, 2026
b67d3ba
Merge latest main M6 FX projection hardening into Milestone O1 safely
masarray Nov 11, 2026
069d57c
O1 realtime safety: latch and validate each external tap target exact…
masarray Nov 11, 2026
fa47696
O2 .smix regression: physical output ChannelId round-trip, legacy dec…
masarray Nov 11, 2026
2d8e0d8
O1 safety: per-channel amplifier authorization and no stale output re…
masarray Nov 11, 2026
d0ccd61
O2 tests: assert 4/8-output PCM isolation and callback-applied readback
masarray Nov 11, 2026
f70a0aa
O1 safety: clear all physical ASIO taps on muted or rejected native c…
masarray Nov 11, 2026
2eb4c1a
O2 regression: stale epoch and mute silence all eight physical output…
masarray Nov 11, 2026
bf886a1
Merge main into O1: preserve M5 logical readback and FX lease safety
masarray Nov 11, 2026
f2b8fc5
O2: qualify sparse ASIO output ordinals and aliased callback fail-clo…
masarray Nov 11, 2026
29670b3
O2 fixture: assert only driver-exposed buffers on alias rejection
masarray Nov 11, 2026
ba409b3
O2: enforce real CTest PCM and sparse mask assertions in MSVC Release
masarray Nov 11, 2026
42a0342
O2: native MAIN-only mute does not disarm separate ASIO taps
masarray Nov 11, 2026
2709a7d
O2: route MAIN-only mute through authoritative callback and fade all …
masarray Nov 11, 2026
02e5bdb
O2 PCM: prove MAIN-only mute preserves 3 external taps and 8-pin FX h…
masarray Nov 11, 2026
7118d79
Update FX MOVE contract to verify shared eight-pin output de-click he…
masarray Nov 11, 2026
953c7e4
O2: per-channel nonblocking EXT transactions, shared output warning a…
masarray Nov 11, 2026
50b0be1
O2 UI: correct external state CSS newline escaping
masarray Nov 11, 2026
cdc7397
O2: reconcile ASIO physical multi-output with M4 FX host, M5 operator…
masarray Nov 11, 2026
b70e8b9
O2: auto-start verified ASIO external outputs for SOURCE ONLY, honor …
masarray Nov 11, 2026
b789b34
Test O2 auto-start against actual C++ dispatcher equality syntax
masarray Nov 11, 2026
6f83d9c
O2: truthful external PCM LIVE vs hardware MUTED readback, release pe…
masarray Nov 11, 2026
a2cc06c
O2: show SHARED physical output only for multiple feeding ChannelIds
masarray Nov 11, 2026
78f7813
Test: ASIO output pair displays SHARED only when multiple sources sum
masarray Nov 11, 2026
0c8458f
O3: read-only verified ASIO OUTPUTS matrix with callback-status regre…
masarray Nov 11, 2026
6d08b53
O3: verify assembled EXTERNAL OUT ACK, shared pins and physical readb…
masarray Nov 11, 2026
1504688
Test: locate routed ASIO pair by physical identity after pin loss
masarray Nov 11, 2026
869b7cb
O3: show OUTPUTS as fixed read-only section, preserve unique Advanced…
masarray Nov 11, 2026
603dc2a
O4: fail closed on aliased independent ASIO output buffers and prove …
masarray Nov 11, 2026
bc88ece
O5: revoke stale external LIVE readback after failed native ASIO render
masarray Nov 11, 2026
abc4d42
O6: preserve ASIO amplifier provenance and independently rebind verif…
masarray Nov 11, 2026
542c93a
Integrate latest Harmonice main and preserve O1-O6 Multi-Out
masarray Nov 11, 2026
aa917e3
FAT: authenticate historical release metadata with scoped read-only A…
masarray Nov 11, 2026
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
3 changes: 3 additions & 0 deletions .github/workflows/p1-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,9 @@ jobs:
- name: Prove two authentic historical Inno releases upgrade and roll back
if: ${{ github.event_name == 'workflow_dispatch' && inputs.package_fat == true }}
shell: pwsh
env:
# Per-job contents:read; do not forward to asset redirect URLs.
GITHUB_TOKEN: ${{ github.token }}
run: |
& ./scripts/test_two_genuine_inno_releases_windows.ps1
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
Expand Down
7 changes: 7 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,13 @@ if(BUILD_TESTING)
# all CTests. Make its native session regression a build dependency so the
# new executable is actually present (without editing the CI target list).
add_dependencies(ARMixMixerRoutingTests ARMixDynamicAcceptedSessionTests)
# O1/O2: integrated deterministic PCM on the existing Windows FAT CTest.
# No additional workflow job or duplicate native build.
add_executable(ARMixPhysicalExternalOutputTests tests/physical_external_output_pcm_test.cpp)
target_compile_features(ARMixPhysicalExternalOutputTests PRIVATE cxx_std_20)
add_test(NAME O1PhysicalExternalOutputNativePcmAndFailClosedRouting
COMMAND ARMixPhysicalExternalOutputTests)
add_dependencies(ARMixMixerRoutingTests ARMixPhysicalExternalOutputTests)
# Integration-only producer/consumer: accepted ChannelId readback + real
# offline PCM with CH07/CH02, GROUP, wet FX RETURN and MONITOR. No new host.
add_executable(ARMixConsoleBridgeV6Tests tests/console_native_integration_test.cpp
Expand Down
59 changes: 51 additions & 8 deletions engine/core/DynamicNativeSessionPublisher.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,24 @@ class DynamicNativeSessionPublisher final {
float* monitorL=nullptr,float* monitorR=nullptr,
std::span<float> channelPeaksL={},
std::span<float> channelPeaksR={},
std::span<const DynamicPlayerPcmBlock> playerPcm={}) noexcept {
std::span<const DynamicPlayerPcmBlock> playerPcm={},
float* const* hardwareOutputs=nullptr,
int hardwareOutputCount=0) noexcept {
static_assert(std::is_nothrow_invocable_v<Fx,ChannelId,float*,float*,int>,
"Realtime VST dispatch must be noexcept");
const auto clearOutputs=[&]() noexcept {
if(frames>0 && mainL)std::fill_n(mainL,frames,0.f);
if(frames>0 && mainR && mainR!=mainL)std::fill_n(mainR,frames,0.f);
if(frames>0 && monitorL)std::fill_n(monitorL,frames,0.f);
if(frames>0 && monitorR && monitorR!=monitorL)
std::fill_n(monitorR,frames,0.f);
// A rejected/stale/muted native render must silence *every*
// ASIO destination, not only MAIN/MONITOR. Otherwise a previous
// external tap can remain in a driver-provided output buffer.
// Bounded callback-ordinal traversal; no allocations or locks.
if(frames<=0 || frames>8192)return;
if(hardwareOutputs && hardwareOutputCount>0 && hardwareOutputCount<=256)
for(int c=0;c<hardwareOutputCount;++c)
if(hardwareOutputs[c])std::fill_n(hardwareOutputs[c],frames,0.f);
if(mainL)std::fill_n(mainL,frames,0.f);
if(mainR && mainR!=mainL)std::fill_n(mainR,frames,0.f);
if(monitorL)std::fill_n(monitorL,frames,0.f);
if(monitorR && monitorR!=monitorL)std::fill_n(monitorR,frames,0.f);
};
if(frames<=0 || frames>8192 || !mainL || !mainR ||
mainL==mainR || physicalCount<0 || physicalCount>256 ||
Expand All @@ -196,6 +205,11 @@ class DynamicNativeSessionPublisher final {
physicalCount!=snap->prepared->physicalInputs ||
(snap->prepared->monitor && !monitorL) ||
frames>snap->prepared->graph.capacity()) {
// A real, current-epoch callback with a changed input count or
// unsafe quantum must not retain last block's EXTERNAL LIVE
// readback after every hardware buffer was silenced.
if(snap && snap->prepared)
snap->prepared->graph.invalidateAppliedExternalOutputs();
clearOutputs();return false;
}
// A single callback producer owns the prepared scratch. In case a
Expand Down Expand Up @@ -225,8 +239,16 @@ class DynamicNativeSessionPublisher final {
};
const bool ok=snap->prepared->graph.process(
physical,physicalCount,mainL,mainR,frames,
dispatch,monitorL,monitorR,channelPeaksL,channelPeaksR,playerPcm);
if(!ok)clearOutputs();
dispatch,monitorL,monitorR,channelPeaksL,channelPeaksR,playerPcm,
hardwareOutputs,hardwareOutputCount);
if(!ok) {
// A rejected physical callback (including aliased independent
// amplifier buffers) emits silence, not a stale LIVE snapshot.
// The approved GUI will report PENDING until a later successful
// PCM callback re-publishes APPLIED on the same ChannelId graph.
snap->prepared->graph.invalidateAppliedExternalOutputs();
clearOutputs();
}
return ok;
}

Expand Down Expand Up @@ -258,6 +280,27 @@ class DynamicNativeSessionPublisher final {
return current?&current->routing:nullptr;
}

// O1 CONTROL only: one epoch/revision-guarded target in the same PCM graph.
// Caller validates actual driver pins and MAIN/MONITOR collision first.
bool setExternalOutput(std::uint64_t epoch,std::uint64_t revision,
ChannelId id,int left,int right,int outputCount) noexcept {
return publisher_.updateActiveControl(epoch,revision,
[&](Prepared& active) noexcept {
return active.graph.setExternalOutput(id,left,right,outputCount);
});
}
std::pair<int,int> externalOutput(std::uint64_t epoch,
std::uint64_t revision,ChannelId id) const noexcept {
const auto* p=publisher_.controlPrepared(epoch,revision);
return p?p->graph.externalOutput(id):std::pair<int,int>{-1,-1};
}

std::pair<int,int> appliedExternalOutput(std::uint64_t epoch,
std::uint64_t revision,ChannelId id) const noexcept {
const auto* p=publisher_.controlPrepared(epoch,revision);
return p?p->graph.appliedExternalOutput(id):std::pair<int,int>{-1,-1};
}

// M3C realtime parameters on the accepted ChannelId graph ONLY.
// Caller must propagate the real device epoch and native ACK revision.
// Rejected/stale edits leave the last accepted PCM unchanged.
Expand Down
Loading
Loading