Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d48e89b
H1: introduce Win32 global hotkey service with transactional registra…
masarray Nov 10, 2026
d52f785
H1: encode and validate optional stable ChannelId hotkeys in .smix wi…
masarray Nov 10, 2026
0351ad6
H1: dispatch background Win32 shortcuts through admitted ChannelId co…
masarray Nov 10, 2026
b6f864f
H1: temporarily release registered keys only during explicit capture …
masarray Nov 10, 2026
5e0c2d6
H1: capture lifecycle restores global chords before transactional Sav…
masarray Nov 10, 2026
05712a3
H1: compact right-click hotkey capture, native-backed register and co…
masarray Nov 10, 2026
2ea0401
H1: keep Win32 hotkey service on JUCE core and avoid temporary-array …
masarray Nov 10, 2026
7ce56e9
H1: add native global shortcut validation, OS registration and persis…
masarray Nov 10, 2026
7ca7205
H1: wire focused native shortcut CTest into existing selective test s…
masarray Nov 10, 2026
d75fbd8
H1: test .smix shortcut roundtrip, stable IDs, migration and corrupte…
masarray Nov 10, 2026
3898a50
H1: guard approved native GUI bundling and real Win32 dispatch paths …
masarray Nov 10, 2026
1da9672
H1: refuse registration when exact native ChannelId mute/solo capabil…
masarray Nov 10, 2026
408b0bf
H1: make .smix hotkey import transactional, including intentional emp…
masarray Nov 10, 2026
f90e978
H1: preserve newer shortcut journal on automatic restart, explicit .s…
masarray Nov 10, 2026
3b0be0b
H1: preserve orphaned ChannelId shortcuts as inert .smix Needs Remap …
masarray Nov 10, 2026
710a6bb
H1: show missing/stale native hotkey targets as Needs Remap without r…
masarray Nov 10, 2026
713009d
H1: cover orphan shortcut recovery without corrupting whole mixer ses…
masarray Nov 10, 2026
6972a6a
H1: isolate Win32 min/max macros so global hotkey service cannot brea…
masarray Nov 10, 2026
31a2499
Merge latest main M2a native device Apply with isolated H1 hotkey fea…
masarray Nov 10, 2026
e03bf13
H1: add validated stable FX rack and exact instance hotkey target schema
masarray Nov 10, 2026
3c45a06
H1: route per-rack and exact-plugin FX Power shortcuts through native…
masarray Nov 10, 2026
e2e93d4
H1 GUI: FX instance-bound target capture, short assignment labels and…
masarray Nov 10, 2026
9872251
H1 GUI: right-click Rack/FX slot Power to assign/change/remove native…
masarray Nov 10, 2026
63698bb
H1 CTest: FX power per rack and slot identity, persistence, malformed…
masarray Nov 10, 2026
fa3cfc3
H1 .smix: persist rack and exact FX insert hotkeys without changing s…
masarray Nov 10, 2026
7e6b509
H1 UI contract: assert real native FX Power hotkey targets and short …
masarray Nov 10, 2026
c5e1436
Merge M2c native hardware readback with H1 exact FX Power hotkeys and…
masarray Nov 10, 2026
34c33a7
test(H1): load native host before FX hotkey contract assertions
masarray Nov 10, 2026
969fe9a
H1 persistence: restore FX processor token in existing control-thread…
masarray Nov 10, 2026
1633db1
H1 .smix: optional validated durable FX instance tokens survive Save/…
masarray Nov 10, 2026
7fbdaaa
H1 restore: rebind original plugin instance identity to physical FX l…
masarray Nov 10, 2026
831fa53
H1 Save: capture stable FX lease identity beside verified vendor state
masarray Nov 10, 2026
18d7278
test(H1): prove stable native FX Power instance survives .smix, new i…
masarray Nov 10, 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
13 changes: 13 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,19 @@ if(BUILD_TESTING)
target_compile_features(ARMixDurableMixerSessionTests PRIVATE cxx_std_20)
target_compile_definitions(ARMixDurableMixerSessionTests PRIVATE JUCE_MODAL_LOOPS_PERMITTED=1)
add_test(NAME P0DynamicMixerSessionDocumentAndCrashSafeRecovery COMMAND ARMixDurableMixerSessionTests)
# H1 OS-global shortcut registration and stable identity are control-only.
juce_add_console_app(ARMixNativeHotkeyTests PRODUCT_NAME "ArSonMix Native Hotkey Registry Tests")
target_sources(ARMixNativeHotkeyTests PRIVATE tests/native_hotkey_registry_test.cpp
src/NativeHotkeyRegistry.h)
target_link_libraries(ARMixNativeHotkeyTests PRIVATE
juce::juce_core juce::juce_recommended_config_flags)
if(WIN32)
target_link_libraries(ARMixNativeHotkeyTests PRIVATE user32 comctl32)
endif()
target_compile_features(ARMixNativeHotkeyTests PRIVATE cxx_std_20)
add_test(NAME H1NativeGlobalShortcutRegistrationConflictAndPersistence
COMMAND ARMixNativeHotkeyTests)

# Presentation-only native identity; no audio-thread access.
juce_add_console_app(ARMixChannelAppearanceTests PRODUCT_NAME "ArSonMix Channel Appearance Tests")
target_sources(ARMixChannelAppearanceTests PRIVATE
Expand Down
25 changes: 22 additions & 3 deletions engine/core/LiveChannelFxGraph.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,32 @@ class LiveChannelFxGraph final {
std::atomic<unsigned> exceptions{0};

FxInstance(std::unique_ptr<Processor> p,juce::String id,juce::String label,
int maxSamples)
int maxSamples,juce::String restoredInstance={})
: processor(std::move(p)),catalogId(std::move(id)),name(std::move(label)),
instanceId("g5c-"+juce::String(static_cast<juce::int64>(
nextId.fetch_add(1,std::memory_order_relaxed)))),
// A restored .smix insert retains the SAME logical identity.
// Newly-added FX still receive a fresh per-process token.
instanceId(restoredInstance.isNotEmpty()?std::move(restoredInstance):
"g5c-"+juce::String(static_cast<juce::int64>(
nextId.fetch_add(1,std::memory_order_relaxed)))),
latencySamples(processor?processor->getLatencySamples():0),
dryLeft(static_cast<std::size_t>(maxSamples)),
dryRight(static_cast<std::size_t>(maxSamples)) {
// CONTROL thread only. A restored ID must reserve its numeric
// space before subsequent Add FX operations in this process.
// The codec validates the prefix and decimal range; no RT work.
const auto number=instanceId.startsWith("g5c-")?
instanceId.substring(4):juce::String{};
if(number.isNotEmpty() && number.length()<=18 &&
number.containsOnly("0123456789")) {
const auto raw=number.getLargeIntValue();
if(raw>0) {
const auto next=static_cast<std::uint64_t>(raw)+1u;
auto observed=nextId.load(std::memory_order_relaxed);
while(observed<next &&
!nextId.compare_exchange_weak(observed,next,
std::memory_order_relaxed)){}
}
}
if(!dryDelay.prepare(latencySamples))throw std::invalid_argument("VST3 latency exceeds prepared delay budget");
midi.ensureSize(1024);
bypassFade.prepare(false,processor?processor->getSampleRate():48000.0,0);
Expand Down
3 changes: 2 additions & 1 deletion src/LiveDryRoutingLab.h
Original file line number Diff line number Diff line change
Expand Up @@ -2276,7 +2276,8 @@ class LiveDryRoutingLab final {
const auto hash=juce::SHA256(bytes).toHexString();
draft.inserts.push_back({channel.id,slot,(*owner)->catalogId,
{},hash,(*owner)->name,0,
(*owner)->bypassRequested.load(std::memory_order_acquire)});
(*owner)->bypassRequested.load(std::memory_order_acquire),
(*owner)->instanceId});
if(hashes.insert(hash).second) {
armix::shows::BinaryState entry;
entry.sha256=hash;entry.bytes=std::move(bytes);
Expand Down
276 changes: 274 additions & 2 deletions src/Main.cpp

Large diffs are not rendered by default.

Loading
Loading