diff --git a/engine/core/DynamicChannelFxLeaseBank.h b/engine/core/DynamicChannelFxLeaseBank.h index 6547882fa..6009adaa4 100644 --- a/engine/core/DynamicChannelFxLeaseBank.h +++ b/engine/core/DynamicChannelFxLeaseBank.h @@ -265,6 +265,33 @@ class DynamicChannelFxLeaseBank final { return reusePreparedOwners(epoch,revision,prior,destination); } + // Removing a channel must release only that channel's VST3 owners on the + // NEW accepted graph. The retired PCM snapshot still holds its leases + // until its callback readers are gone. Never inherit orphaned FX across + // repeated Add/Delete Track cycles. + static Fault reuseWithoutChannel( + std::uint64_t epoch,std::uint64_t revision, + const DynamicChannelFxLeaseBank& prior,ChannelId removed, + DynamicChannelFxLeaseBank& destination) { + if(!removed.value||!epoch||epoch!=prior.epoch_|| + revision<=prior.revision_)return Fault::invalidEpoch; + std::vector retained; + retained.reserve(prior.rows_.size()); + for(const auto& row:prior.rows_){ + if(row.id==removed)continue; + Assignment item; + item.id=row.id;item.format=row.format; + item.rackBypassed=row.rackBypassed; + item.inserts.reserve(row.count); + for(std::size_t slot=0;slot::max()){ + result.fault=ChannelEditFault::invalidAction;return result; + } + auto candidate=channels_; + const auto target=std::find_if(candidate.begin(),candidate.end(), + [id](const auto& row){return row.id==id;}); + if(target==candidate.end()){ + result.fault=ChannelEditFault::missingChannel;return result; + } + if(target->role!=ChannelRole::input){ + result.fault=ChannelEditFault::invalidValue;return result; + } + for(auto& row:candidate){ + if(row.id==id)continue; + auto& sends=row.sends; + sends.erase(std::remove_if(sends.begin(),sends.end(), + [id](const auto& edge){return edge.destination==id;}), + sends.end()); + } + candidate.erase(std::find_if(candidate.begin(),candidate.end(), + [id](const auto& row){return row.id==id;})); + if(!withinBudget(candidate)){ + result.fault=ChannelEditFault::budgetExceeded;return result; + } + std::uint64_t stagedNextEdge=nextEdgeId_; + if(!assignMissingEdgeIds(candidate,stagedNextEdge)){ + result.fault=ChannelEditFault::idExhausted;return result; + } + auto stagedIndex=buildIndex(candidate); + channels_.swap(candidate); + nextEdgeId_=stagedNextEdge; + index_.swap(stagedIndex); + result.revision=++revision_;return result; + } + // One Studio Console transaction: new independent BUS + multi-source // primary output reroute, or FX return + parallel sends. CONTROL THREAD. // Caller must compile one native graph and publish with device epoch/ACK. diff --git a/integration/ApprovedNativeRuntimeSnapshot.h b/integration/ApprovedNativeRuntimeSnapshot.h index b0b2ba517..824305dea 100644 --- a/integration/ApprovedNativeRuntimeSnapshot.h +++ b/integration/ApprovedNativeRuntimeSnapshot.h @@ -314,6 +314,8 @@ inline bool projectInstalledNativeChannelIdGraph( available.add(juce::String("LOAD_INSERT")); if(has("NATIVE_CREATE_CHANNEL")) available.add(juce::String("CREATE_CHANNEL")); + if(has("NATIVE_DELETE_CHANNEL")) + available.add(juce::String("DELETE_CHANNEL")); if(has("NATIVE_CREATE_GROUP_SELECTED")) available.add(juce::String("CREATE_GROUP")); const auto graph=snapshot.getProperty("graph",{}); diff --git a/scripts/build_approved_native_gui.py b/scripts/build_approved_native_gui.py index 2510ce3e0..0c7d1bcdb 100644 --- a/scripts/build_approved_native_gui.py +++ b/scripts/build_approved_native_gui.py @@ -22,7 +22,8 @@ CANONICAL = ROOT / "site" / "preview-v2" NATIVE_ADAPTER = ROOT / "web" / "approved-native-bridge.js" ADAPTER_MARKER = ('\n' - '') + '\n' + '') SCHEMA = "arsonmix.approved-native-pages-bundle.v2" @@ -327,6 +328,8 @@ def stage(out: Path) -> dict: out.mkdir(parents=True) shutil.copytree(pages / "assets", out / "assets") shutil.copy2(NATIVE_ADAPTER, out / "assets" / "approved-native-bridge.js") + shutil.copy2(ROOT / "web" / "approved-native-context-menu.js", + out / "assets" / "approved-native-context-menu.js") shutil.copy2(ROOT / "web" / "approved-native-contract.js", out / "assets" / "approved-native-contract.js") native = native_html(approved.decode("utf-8")).encode("utf-8") diff --git a/src/LiveAudioEngine.h b/src/LiveAudioEngine.h index 6673188f9..1ebb32023 100644 --- a/src/LiveAudioEngine.h +++ b/src/LiveAudioEngine.h @@ -1808,6 +1808,15 @@ class LiveAudioEngine final : private juce::AudioIODeviceCallback epoch,pcmRevision,rosterRevision,name,format,true,beforePublish); }); } + LiveDryRoutingLab::NativeBusResult removeNativeInputChannel( + std::uint64_t epoch,std::uint64_t pcmRevision, + std::uint64_t rosterRevision,armix::mixer::ChannelId id) { + return editNativeInputTopology(epoch,"NATIVE_TRACK_DEVICE_UNAVAILABLE", + "NATIVE_TRACK_DELETE_PUBLICATION_EXCEPTION",[&](const auto& beforePublish){ + return dryRoutingLab_.removeNativeInputChannel( + epoch,pcmRevision,rosterRevision,id,true,beforePublish); + }); + } LiveDryRoutingLab::NativeBusResult patchNativeInputSource( std::uint64_t epoch,std::uint64_t pcmRevision, std::uint64_t rosterRevision,armix::mixer::ChannelId channel, diff --git a/src/LiveDryRoutingLab.h b/src/LiveDryRoutingLab.h index 4586c57e6..2bc1c92c0 100644 --- a/src/LiveDryRoutingLab.h +++ b/src/LiveDryRoutingLab.h @@ -1679,6 +1679,81 @@ class LiveDryRoutingLab final { } } + // One atomic prepared PCM publication for Delete Audio Track. The + // accepted native source patch, inbound/outbound wires, and VST3 owner + // references are removed together only after a successful graph commit. + NativeBusResult removeNativeInputChannel(std::uint64_t expectedEpoch, + std::uint64_t expectedPcmRevision,std::uint64_t expectedRosterRevision, + armix::mixer::ChannelId id,bool outputsDisarmed=false, + const std::function& beforePublish={}) { + using namespace armix::mixer; + NativeBusResult reply{}; + reply.pcmRevision=nativeAccepted_.pcmRevision; + reply.rosterRevision=nativeAccepted_.graph.roster.revision(); + if(!outputsDisarmed){reply.error="OUTPUT_MUST_BE_DISARMED";return reply;} + if(!channelIdPhysicalPcmActive()||!ready()|| + expectedEpoch!=epoch()||nativeAccepted_.deviceEpoch!=expectedEpoch|| + !nativeAccepted_.fxOwners|| + expectedPcmRevision!=nativeAccepted_.pcmRevision|| + expectedRosterRevision!=nativeAccepted_.graph.roster.revision()){ + reply.error="STALE_NATIVE_TRACK_DELETE";return reply; + } + const auto* target=nativeAccepted_.graph.roster.find(id); + if(!target||target->role!=ChannelRole::input){ + reply.error="NATIVE_INPUT_ID_UNAVAILABLE";return reply; + } + try { + auto roster=nativeAccepted_.graph.roster; + const auto edited=roster.removeInputAndDisconnect(expectedRosterRevision,id); + if(!edited.ok()){ + reply.error="NATIVE_TRACK_DELETE_EDIT_REJECTED";return reply; + } + auto request=nativeAccepted_.graph.request; + auto& inputs=request.sources; + inputs.erase(std::remove_if(inputs.begin(),inputs.end(), + [id](const auto& source){return source.id==id;}), + inputs.end()); + DynamicChannelFxLeaseBank bank; + if(DynamicChannelFxLeaseBank::reuseWithoutChannel( + expectedEpoch,expectedPcmRevision+1, + *nativeAccepted_.fxOwners,id,bank)!= + DynamicChannelFxLeaseBank::Fault::none){ + reply.error="NATIVE_TRACK_FX_RELEASE_REJECTED";return reply; + } + auto owner=std::make_shared(std::move(bank)); + DynamicNativeSessionPublisher::FxPlan fx; + fx.owner=std::static_pointer_cast(owner); + fx.context=owner.get(); + fx.render=+[](void* ctx,ChannelId channel,float* l,float* r,int n) noexcept { + (*static_cast(ctx))(channel,l,r,n); + }; + fx.latency=+[](void* ctx,ChannelId channel) noexcept { + return static_cast(ctx)->latencySamples(channel); + }; + fx.deviceEpoch=expectedEpoch; + fx.graphRevision=expectedPcmRevision+1; + if(beforePublish)beforePublish(); + const auto published=nativePublisher_.commit( + roster,request,expectedPcmRevision, + expectedEpoch,epoch(),true,std::move(fx)); + if(!published.ok()){ + reply.error="NATIVE_TRACK_PCM_COMMIT_REJECTED";return reply; + } + nativeAccepted_.graph.roster=std::move(roster); + nativeAccepted_.graph.request=std::move(request); + nativeAccepted_.fxOwners=std::move(owner); + nativeAccepted_.pcmRevision=published.revision; + nativeStructureLive_=true; + nativeMeterEpoch_.store(0,std::memory_order_release); + reply.accepted=true;reply.error=""; + reply.pcmRevision=published.revision; + reply.rosterRevision=nativeAccepted_.graph.roster.revision(); + return reply; + }catch(...){ + reply.error="NATIVE_TRACK_DELETE_PREPARE_FAILED";return reply; + } + } + // Wire a verified physical capture pin to a dynamically CREATED input. // M4-owned CH1–10 keep the original device/VST continuity contract. // Prepared topology + lease revision is published once; never patch an @@ -2200,7 +2275,7 @@ class LiveDryRoutingLab final { if(!retained) for(const char* op: {"NATIVE_CREATE_GROUP_SELECTED", "NATIVE_REMOVE_BUS","NATIVE_SET_BUS_MIX", - "NATIVE_CREATE_CHANNEL","NATIVE_PATCH_CHANNEL", + "NATIVE_CREATE_CHANNEL","NATIVE_DELETE_CHANNEL","NATIVE_PATCH_CHANNEL", "NATIVE_SET_PRIMARY_OUT", "NATIVE_APPLY_WIRE_TRANSACTION", "NATIVE_SET_WIRE_GAIN", diff --git a/src/Main.cpp b/src/Main.cpp index 6dd2f2745..0f5c3a8cd 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -331,6 +331,11 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr private: LiveAudioEngine engine_; VstOrbitController orbit_; + // The exact native ChannelId/insert identity retains its VST3 owner + // while Orbit's JUCE message-thread timer holds raw parameter pointers. + armix::mixer::LiveChannelFxGraph::InstanceLease nativeOrbitLease_; + juce::String nativeOrbitChannelId_,nativeOrbitInstanceId_; + std::uint64_t nativeOrbitEpoch_=0; juce::int64 fxGraphRevision_ = 1; // control-thread monotonic graph generation PluginCatalog catalog_; DiagnosticsRecorder diagnostics_; @@ -797,18 +802,31 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr normalized); } - void emitOrbitState (int slot,int previewShape=-1) + void emitOrbitState (int slot,int previewShape=-1, + juce::AudioPluginInstance* nativePlugin=nullptr, + const juce::String& channelId={}, + const juce::String& nativeRevision={}, + const juce::String& insertId={}) { auto event = std::make_unique(); event->setProperty ("slot", slot); - event->setProperty ("revision", juce::String (fxGraphRevision_)); + event->setProperty ("revision", nativeRevision.isNotEmpty()? + nativeRevision:juce::String (fxGraphRevision_)); + if(channelId.isNotEmpty()){ + event->setProperty("channelId",channelId); + event->setProperty("instanceId",insertId); + } + const bool activeTarget=orbit_.active()&&orbit_.slot()==slot&& + (channelId.isEmpty()? + nativeOrbitChannelId_.isEmpty(): + nativeOrbitChannelId_==channelId&&nativeOrbitInstanceId_==insertId); const auto& stats = orbit_.stats(); event->setProperty ("controlTicks", static_cast (stats.ticks)); event->setProperty ("parameterWrites", static_cast (stats.writes)); event->setProperty ("coalesced", static_cast (stats.coalesced)); event->setProperty ("lateTicks", static_cast (stats.lateTicks)); event->setProperty ("maxGapMs", stats.maxGapMs); - event->setProperty ("active", orbit_.active()); + event->setProperty ("active", activeTarget); event->setProperty ("activeSlot", orbit_.slot()); event->setProperty ("activeParameter", orbit_.parameterIndex()); event->setProperty ("periodSeconds", orbit_.secondsPerRevolution()); @@ -839,7 +857,8 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr juce::Array listed; int preferred = -1, preferredDistance = -1, preferredElevation = -1; - auto* plugin = engine_.isGraphSwitchPending() ? nullptr : engine_.pluginAt (slot); + auto* plugin = engine_.isGraphSwitchPending() ? nullptr : + (nativePlugin ? nativePlugin : engine_.pluginAt (slot)); if (plugin != nullptr) { event->setProperty ("plugin", plugin->getName()); @@ -872,9 +891,9 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr } } event->setProperty ("preferredParameter", - orbit_.active() && orbit_.slot() == slot ? orbit_.parameterIndex() : preferred); + activeTarget ? orbit_.parameterIndex() : preferred); // Display near/far setpoints for the plugin parameter's *actual* units. - int setpointParam=orbit_.active()&&orbit_.slot()==slot? + int setpointParam=activeTarget? orbit_.distanceParameterIndex():preferredDistance; auto* dist=setpointParam>=0&&plugin!=nullptr&& setpointParamgetParameters().size()? @@ -884,7 +903,6 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr event->setProperty("distanceUnit",metres?"m":"%"); event->setProperty("distanceMin",metres?minMetres:0.0); event->setProperty("distanceMax",metres?maxMetres:100.0); - const bool activeTarget=orbit_.active()&&orbit_.slot()==slot; const double nearValue=activeTarget?orbit_.nearDistance():0.2; const double farValue=activeTarget?orbit_.farDistance():0.7; if(metres){ @@ -903,24 +921,38 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr event->setProperty ("preferredElevation",preferredElevation); event->setProperty ("parameters", juce::var (listed)); if (browser_.loaded) - browser_.emitEventIfBrowserIsVisible ("arMixOrbitState", juce::var (event.release())); + browser_.emitEventIfBrowserIsVisible (channelId.isEmpty()? + "arMixOrbitState":"arMixNativeOrbitState",juce::var(event.release())); } - // Stop while the VST3 instance still exists and synchronize its UI state. + // Stop before releasing the lease referenced by Orbit's raw vendor + // parameter pointers. The old legacy event remains unchanged. void stopOrbit() { - const int previousSlot = orbit_.slot(); - if (!orbit_.active()) return; - const auto result = orbit_.stats(); + const int previousSlot=orbit_.slot(); + const auto nativeId=nativeOrbitChannelId_,insertId=nativeOrbitInstanceId_; + auto* nativePlugin=nativeOrbitLease_&&nativeOrbitLease_->processor? + dynamic_cast( + nativeOrbitLease_->processor.get()):nullptr; + if(!orbit_.active()){ + nativeOrbitLease_.reset();nativeOrbitChannelId_.clear(); + nativeOrbitInstanceId_.clear();nativeOrbitEpoch_=0; + return; + } + const auto result=orbit_.stats(); orbit_.stop(); - diagnostics_.record ("FX_ORBIT_CONTROL", - "ticks=" + juce::String (static_cast (result.ticks)) + - " writes=" + juce::String (static_cast (result.writes)) + - " coalesced=" + juce::String (static_cast (result.coalesced)) + - " lateTicks=" + juce::String (static_cast (result.lateTicks)) + - " maxTimerGapMs=" + juce::String (result.maxGapMs, 1) + + diagnostics_.record("FX_ORBIT_CONTROL", + "ticks="+juce::String(static_cast(result.ticks))+ + " writes="+juce::String(static_cast(result.writes))+ + " coalesced="+juce::String(static_cast(result.coalesced))+ + " lateTicks="+juce::String(static_cast(result.lateTicks))+ + " maxTimerGapMs="+juce::String(result.maxGapMs,1)+ " | timer delay is NOT a hardware xrun"); - emitOrbitState (previousSlot); + if(nativeId.isNotEmpty()) + emitOrbitState(previousSlot,-1,nativePlugin,nativeId,{},insertId); + else emitOrbitState(previousSlot); + nativeOrbitLease_.reset();nativeOrbitChannelId_.clear(); + nativeOrbitInstanceId_.clear();nativeOrbitEpoch_=0; } juce::var approvedNativeSnapshot (const juce::var& live) @@ -2854,6 +2886,229 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr return; } + // Native Delete Audio Track uses exact ChannelId and accepted device, + // graph and roster revisions, with a single prepared PCM publication. + if(action=="routingNativeTrackDelete") { + const auto request=args.getProperty("requestId",{}).toString(); + const auto rawId=args.getProperty("channelId",{}); + const auto rawEp=args.getProperty("deviceEpoch",{}); + const auto rawRev=args.getProperty("graphRevision",{}); + const auto rawRoster=args.getProperty("rosterRevision",{}); + std::uint64_t id=0,ep=0,rev=0,roster=0; + const auto snap=approvedNativeSnapshot(); + const auto device=snap.getProperty("device",{}); + const auto graph=snap.getProperty("graph",{}); + const auto caps=graph.getProperty("capabilities",{}) + .getProperty("supportedOps",{}); + const auto channels=graph.getProperty("channels",{}); + bool input=false; + if(const auto* rows=channels.getArray()) + for(const auto& row:*rows) + if(row.getProperty("id","").toString()==rawId.toString() && + row.getProperty("role","").toString()=="INPUT") + input=true; + const bool supported=caps.isArray()&& + caps.getArray()->contains(juce::String("DELETE_CHANNEL")); + const bool valid=request.startsWith("track-delete-")&& + request.length()<=64&&!acceptedControlRequests_.contains(request)&& + armix::console::approvedNativeId(rawId,id)&& + armix::console::approvedNativeId(rawEp,ep)&& + armix::console::approvedNativeId(rawRev,rev)&& + armix::console::approvedNativeId(rawRoster,roster)&& + input&&supported&& + device.getProperty("epoch","").toString()==rawEp.toString()&& + graph.getProperty("revision","").toString()==rawRev.toString()&& + graph.getProperty("rosterRevision","").toString()==rawRoster.toString()&& + !nativeShowBusy_&&!studioBackupBusy_; + LiveDryRoutingLab::NativeBusResult result; + result.error="NATIVE_TRACK_DELETE_NOT_ADMITTED_OR_STALE"; + if(valid){ + acceptedControlRequests_.add(request); + if(acceptedControlRequests_.size()>512) + acceptedControlRequests_.remove(0); + result=engine_.removeNativeInputChannel(ep,rev,roster, + armix::mixer::ChannelId{id}); + } + auto ack=std::make_unique(); + ack->setProperty("requestId",request); + ack->setProperty("channelId",rawId); + ack->setProperty("ok",valid&&result.accepted); + ack->setProperty("error",result.error?result.error:"NATIVE_TRACK_DELETE_UNKNOWN"); + ack->setProperty("graphRevision", + juce::String(std::to_string(result.pcmRevision))); + if(browser_.loaded) + browser_.emitEventIfBrowserIsVisible( + "arMixNativeTrackDeleteAck",juce::var(ack.release())); + if(valid&&result.accepted && orbit_.active() && + nativeOrbitChannelId_==rawId.toString())stopOrbit(); + if(valid&&result.accepted) + diagnostics_.record("NATIVE_DAW_TRACK_DELETE", + "Removed one ChannelId with source, wires and FX leases"); + else emitNotice("Delete Audio Track rejected: "+ + juce::String(result.error?result.error:"native error"),true); + return; + } + + + // Native VST3 Orbit is bound to a verified ChannelId and a live + // instance lease, not the legacy ordinal engine_.pluginAt(slot). + if(action=="routingNativeOrbitInspect"|| + action=="routingNativeOrbitStart"|| + action=="routingNativeOrbitStop"|| + action=="routingM4OrbitInspect"|| + action=="routingM4OrbitStart"|| + action=="routingM4OrbitStop"){ + const bool m4=action.startsWith("routingM4Orbit"); + const auto rawId=args.getProperty("channelId",{}), + rawInsert=args.getProperty("instanceId",{}), + rawEp=args.getProperty("deviceEpoch",{}), + rawRev=args.getProperty(m4?"revision":"graphRevision",{}), + rawRoster=args.getProperty("rosterRevision",{}); + const int lane=static_cast(args.getProperty("channel",-1)); + const auto idText=m4? + "m4-lane-"+juce::String(lane):rawId.toString(); + const auto insertId=rawInsert.toString(); + const int nativeSlot=static_cast(args.getProperty("slot",-1)); + std::uint64_t id=0,ep=0,rev=0,roster=0; + const auto snap=approvedNativeSnapshot(); + const auto graph=snap.getProperty("graph",{}), + device=snap.getProperty("device",{}); + bool nativeMatches=false,m4Matches=false; + const auto channels=graph.getProperty("channels",{}); + if(!m4)if(const auto* rows=channels.getArray()) + for(const auto& row:*rows)if(row.getProperty("id","").toString()==idText){ + const auto inserts=row.getProperty("inserts",{}); + if(const auto* slots=inserts.getArray()) + if(nativeSlot>=0&&nativeSlotsize()&& + (*slots)[nativeSlot].getProperty("id","").toString()==insertId) + nativeMatches=true; + break; + } + const auto lab=engine_.status().getProperty("dryRoutingLab",{}); + if(m4&&lane>=0&&lanesize()){ + const auto list=(*rows)[lane]; + if(const auto* slots=list.getArray()) + if(nativeSlot>=0&&nativeSlotsize()&& + (*slots)[nativeSlot].getProperty("instanceId","").toString()==insertId) + m4Matches=true; + } + } + const bool counters=armix::console::approvedNativeId(rawEp,ep)&& + armix::console::approvedNativeId(rawRev,rev); + const bool ready=!nativeShowBusy_&&!studioBackupBusy_&& + !engine_.isGraphSwitchPending()&&counters&& + nativeSlot>=0&&nativeSlot<8&&!insertId.isEmpty(); + const bool accepted=ready&&(m4? + (m4Matches&& + static_cast(lab.getProperty("active",false))&& + static_cast(lab.getProperty("hasAcceptedRoute",false))&& + lab.getProperty("epoch",{}).toString()==rawEp.toString()&& + lab.getProperty("revision",{}).toString()==rawRev.toString()): + (nativeMatches&&armix::console::approvedNativeId(rawId,id)&& + armix::console::approvedNativeId(rawRoster,roster)&& + device.getProperty("epoch","").toString()==rawEp.toString()&& + graph.getProperty("revision","").toString()==rawRev.toString()&& + graph.getProperty("rosterRevision","").toString()==rawRoster.toString())); + if(!accepted){ + emitNotice("Orbit target is stale or not admitted; reopen the FX menu.",true); + return; + } + const auto lease=m4? + engine_.leaseRoutedFxForEditor(lane,nativeSlot,ep,rev,insertId): + engine_.leaseNativeVst3Editor(ep,rev,armix::mixer::ChannelId{id}, + static_cast(nativeSlot),insertId); + auto* plugin=lease&&lease->processor? + dynamic_cast(lease->processor.get()):nullptr; + if(!plugin||!armix::core::isDearVrPro2(plugin->getName().toStdString())){ + emitNotice("Orbit requires the verified dearVR PRO 2 VST3 instance.",true); + return; + } + if(action=="routingNativeOrbitInspect"|| + action=="routingM4OrbitInspect"){ + const auto shapeArg=args.getProperty("shape",-1); + const int shape=shapeArg.isInt()?static_cast(shapeArg):-1; + emitOrbitState(nativeSlot,shape,plugin,idText,rawRev.toString(),insertId); + return; + } + if(action=="routingNativeOrbitStop"|| + action=="routingM4OrbitStop"){ + if(orbit_.active()&&nativeOrbitChannelId_==idText&& + nativeOrbitInstanceId_==insertId)stopOrbit(); + else emitOrbitState(nativeSlot,-1,plugin,idText,rawRev.toString(),insertId); + return; + } + const auto shapeArg=args.getProperty("shape",-1), + azArg=args.getProperty("parameterIndex",-1), + distArg=args.getProperty("distanceIndex",-1), + elevArg=args.getProperty("elevationIndex",-1), + nearArg=args.getProperty("nearDistance",-1.0), + farArg=args.getProperty("farDistance",-1.0), + secondsArg=args.getProperty("seconds",20.0), + reverseArg=args.getProperty("reverse",false); + if(!shapeArg.isInt()|| + !(azArg.isInt()||azArg.isInt64())|| + !(distArg.isInt()||distArg.isInt64())|| + !(elevArg.isInt()||elevArg.isInt64())|| + !(nearArg.isDouble()||nearArg.isInt())|| + !(farArg.isDouble()||farArg.isInt())|| + !(secondsArg.isDouble()||secondsArg.isInt())|| + !reverseArg.isBool()){ + emitNotice("Orbit settings are invalid.",true);return; + } + const int shape=static_cast(shapeArg), + az=static_cast(azArg), + distance=static_cast(distArg), + elevation=static_cast(elevArg); + if(!armix::core::validOrbitShape(shape)){ + emitNotice("Orbit path is invalid.",true);return; + } + const double nearSetpoint=static_cast(nearArg), + farSetpoint=static_cast(farArg); + float normalizedNear=0.f,normalizedFar=1.f; + const auto unit=args.getProperty("distanceUnit",{}).toString(); + if(unit=="m"){ + if(distance<0||distance>=plugin->getParameters().size()|| + !metresToNormalized(plugin->getParameters()[distance],nearSetpoint,normalizedNear)|| + !metresToNormalized(plugin->getParameters()[distance],farSetpoint,normalizedFar)){ + emitNotice("Orbit metre setpoints do not match the vendor parameter.",true); + return; + } + }else if(unit=="%"){ + if(!std::isfinite(nearSetpoint)||!std::isfinite(farSetpoint)|| + nearSetpoint<0||farSetpoint>100){ + emitNotice("Orbit distance must be 0–100%.",true);return; + } + normalizedNear=static_cast(nearSetpoint/100.0); + normalizedFar=static_cast(farSetpoint/100.0); + }else{ + emitNotice("Orbit distance unit is invalid.",true);return; + } + if(normalizedNear>normalizedFar){ + emitNotice("Orbit Near cannot exceed Far.",true);return; + } + // Old VST3 instance must stop BEFORE its new lease is installed. + if(orbit_.active())stopOrbit(); + const auto error=orbit_.start(plugin,nativeSlot,az, + static_cast(secondsArg), + static_cast(reverseArg),shape,distance,elevation, + normalizedNear,normalizedFar); + if(error.isNotEmpty()){ + emitNotice("Orbit: "+error,true);return; + } + nativeOrbitLease_=lease; + nativeOrbitChannelId_=idText; + nativeOrbitInstanceId_=insertId; + nativeOrbitEpoch_=ep; + emitOrbitState(nativeSlot,-1,plugin,idText,rawRev.toString(),insertId); + diagnostics_.record("NATIVE_DAW_ORBIT", + "ChannelId="+idText+" slot="+juce::String(nativeSlot)+ + " vendor instance="+insertId); + return; + } + // G5C native per-instance BYPASS never recompiles the graph and // does not require muting the output. All identity gates must agree. if (action == "routingFxBypass") { @@ -4070,6 +4325,11 @@ class ConsoleWindow final : public juce::DocumentWindow, private juce::Timer, pr crackleEvidence_.push (makeEvidenceSample (state)); diagnostics_.record ("AUDIO_HEALTH", juce::JSON::toString (state, false)); } + // Guard borrowed VST parameter pointers when a native graph edit, + // device epoch change or Show recall retires the instance. + if(nativeOrbitLease_ && orbit_.active() && + (!engine_.retainsRoutedFxEditor(nativeOrbitEpoch_,nativeOrbitLease_))) + stopOrbit(); if(routedEditorOwner_ && !engine_.retainsRoutedFxEditor(routedEditorEpoch_,routedEditorOwner_)) closePluginEditor(); diff --git a/tests/approved_native_gui_bundle_test.py b/tests/approved_native_gui_bundle_test.py index 2d12c4882..4ad0188bf 100644 --- a/tests/approved_native_gui_bundle_test.py +++ b/tests/approved_native_gui_bundle_test.py @@ -41,6 +41,12 @@ def test_native_is_exact_assembled_public_pages_plus_nonvisual_native_seam(self) self.assertEqual(manifest["approvedPagesHtmlSha256"], bundle.sha256((source / "index.html").read_bytes())) self.assertNotEqual(native, (ROOT / "web/index.html").read_text("utf-8")) self.assertIn("approved-native-bridge.js", native) + self.assertIn("approved-native-context-menu.js", native) + context_menu = (out / "assets/approved-native-context-menu.js").read_text("utf-8") + self.assertIn('document.addEventListener("contextmenu"', context_menu) + self.assertIn("requestDeleteTrack", context_menu) + self.assertIn("orbitAction", context_menu) + self.assertNotIn("approved-native-context-menu.js", approved) self.assertIn("arMixGuiReady", (out / "assets/approved-native-bridge.js").read_text("utf-8")) for asset in (source / "assets").iterdir(): self.assertEqual((out / "assets" / asset.name).read_bytes(), asset.read_bytes(), diff --git a/tests/approved_native_m2_contract.test.cjs b/tests/approved_native_m2_contract.test.cjs index c939326fd..d846bfab8 100644 --- a/tests/approved_native_m2_contract.test.cjs +++ b/tests/approved_native_m2_contract.test.cjs @@ -429,6 +429,41 @@ test("P0 post-BUS native IN routes NONE MONO STEREO via one PCM owner",()=>{ assert.match(lab,/nativeStructureLive_=true; \/\/ M4 source roster no longer authoritative/); assert.match(engine,/NATIVE_SOURCE_PUBLICATION_EXCEPTION/); }); +test("native right-click track deletion and vendor-specific Orbit are graph-authoritative",()=>{ + const menu=read("web/approved-native-context-menu.js"); + // Parse the actual deferred WebView2 menu script before any Windows package. + assert.doesNotThrow(()=>new (require("node:vm").Script)(menu)); + const bridge=read("web/approved-native-bridge.js"); + const host=read("src/Main.cpp"); + const lab=read("src/LiveDryRoutingLab.h"); + const roster=read("engine/core/DynamicChannelRoster.h"); + const fxBank=read("engine/core/DynamicChannelFxLeaseBank.h"); + const installer=read("scripts/build_approved_native_gui.py"); + assert.match(menu,/document\.addEventListener\("contextmenu"/); + assert.match(menu,/e\.preventDefault\(\)/); + assert.match(menu,/\.strip-identity-top/); + assert.match(menu,/\.fxslot-row:not\(\.is-empty\)/); + assert.match(menu,/Confirm Delete Track/); + assert.match(menu,/requestDeleteTrack\(track\)/); + assert.match(menu,/hooks\.orbitTarget\(track,slot\)/); + assert.match(bridge,/action:"routingNativeTrackDelete"/); + assert.match(bridge,/arMixNativeTrackDeleteAck/); + assert.match(bridge,/function finishNativeTrackDelete\(next\)/); + assert.match(bridge,/pending\.acked/); + assert.match(bridge,/kind==="inspect"\?"routingNativeOrbitInspect"/); + assert.match(bridge,/kind==="inspect"\?"routingM4OrbitInspect"/); + assert.match(host,/engine_\.leaseRoutedFxForEditor\(/); + assert.match(host,/engine_\.removeNativeInputChannel\(ep,rev,roster,/); + assert.match(host,/engine_\.leaseNativeVst3Editor\(/); + assert.match(host,/nativeOrbitLease_/); + assert.match(host,/arMixNativeOrbitState/); + assert.match(lab,/removeNativeInputChannel/); + assert.match(lab,/request\.sources/); + assert.match(roster,/removeInputAndDisconnect/); + assert.match(fxBank,/reuseWithoutChannel/); + assert.match(installer,/approved-native-context-menu\.js/); +}); + test("P0 actual Add BUS reaches the live ChannelId graph",()=>{ const bridge=read("web/approved-native-bridge.js"); const host=read("src/Main.cpp"); diff --git a/tests/dynamic_accepted_session_test.cpp b/tests/dynamic_accepted_session_test.cpp index 85c1d3eb7..56b2cecc4 100644 --- a/tests/dynamic_accepted_session_test.cpp +++ b/tests/dynamic_accepted_session_test.cpp @@ -797,7 +797,48 @@ static void verifyGroupMuteAffectsRealNativePcm() { assert(render()&&near(l[63],audible,1e-4f)); } +static void verifyNativeDeleteTrackRetainsUnrelatedWires() { + DynamicChannelRoster roster; + const std::array create{ + add(0,ChannelRole::input,"TRACK A",ProcessingFormat::stereo), + add(1,ChannelRole::input,"TRACK B",ProcessingFormat::stereo), + add(2,ChannelRole::input,"TRACK C",ProcessingFormat::stereo), + add(3,ChannelRole::main,"MAIN",ProcessingFormat::stereo)}; + const auto made=roster.edit(0,create); + assert(made.ok()&&made.createdIds.size()==4); + const auto a=made.createdIds[0],b=made.createdIds[1], + c=made.createdIds[2],main=made.createdIds[3]; + const std::array wires{ + output(a,b),output(b,main),output(c,main)}; + assert(roster.edit(1,wires).ok()); + const auto before=roster.revision(); + assert(roster.removeInputAndDisconnect(before,main).fault== + ChannelEditFault::invalidValue); + assert(roster.removeInputAndDisconnect(before+1,b).fault== + ChannelEditFault::staleRevision); + assert(roster.size()==4&&roster.revision()==before); + const auto deleted=roster.removeInputAndDisconnect(before,b); + assert(deleted.ok()&&roster.size()==3&&!roster.find(b)); + assert(roster.find(a)&&roster.find(c)&&roster.find(main)); + // Source A remains present, but its original output cable to B is + // removed. C's unrelated MAIN cable remains live with its identity. + assert(roster.find(a)->sends.empty()); + assert(roster.find(c)->sends.size()==1); + assert(roster.find(c)->sends.front().destination==main); + DynamicGraphRequest route; + route.maxFrames=64;route.physicalInputs=1; + route.sources={{c,0,-1,false}}; + DynamicPreparedMixerBlock block; + DynamicGraphError error; + assert(DynamicPreparedMixerBlock::compile(roster,route,block,error)); + assert(block.channelCount()==3); + assert(roster.removeInputAndDisconnect(roster.revision(),b).fault== + ChannelEditFault::missingChannel); + assert(roster.revision()==before+1); +} + int main() { + verifyNativeDeleteTrackRetainsUnrelatedWires(); verifyGroupMuteAffectsRealNativePcm(); verifySourceOnlyParallelMainVsExclusivePrimaryPcm(); verifyHeldDragIntermediatePcmOnOriginalChannels(); diff --git a/web/approved-native-bridge.js b/web/approved-native-bridge.js index 580173cb1..4702ca93a 100644 --- a/web/approved-native-bridge.js +++ b/web/approved-native-bridge.js @@ -804,7 +804,82 @@ controller?.subscribe(); },8000); } - let pendingBusCreate=null,stripRequestSerial=0; + let pendingBusCreate=null,pendingTrackDelete=null,stripRequestSerial=0; + function requestNativeTrackDelete(track){ + const current=controller?.state()?.current,id=nativeIdFor(track); + const channel=current?.graph?.channels?.find(ch=>ch.id===id); + if(!connected||pendingTrackDelete||pendingBusCreate||controller?.state()?.pending|| + !current?.admitted||current.retained||channel?.role!=="INPUT"|| + !current.graph.capabilities.supportedOps.includes("DELETE_CHANNEL")){ + nativeToast("Delete Track unavailable · wait for an admitted native input channel"); + return false; + } + const requestId="track-delete-"+(++stripRequestSerial); + pendingTrackDelete={requestId,id,name:track.name,epoch:current.device.epoch, + revision:current.graph.revision,acked:false}; + syncAddTrack(current); + backend.emitEvent("arMixAction",{ + action:"routingNativeTrackDelete",requestId,channelId:id, + deviceEpoch:current.device.epoch,graphRevision:current.graph.revision, + rosterRevision:current.graph.rosterRevision + }); + status("Deleting "+track.name+" · waiting for native PCM ACK/readback"); + window.setTimeout(()=>{ + if(pendingTrackDelete?.requestId!==requestId)return; + pendingTrackDelete=null;syncAddTrack(); + nativeToast("Delete Track timed out · accepted mixer unchanged until readback"); + controller?.subscribe(); + },8000); + return true; + } + function finishNativeTrackDelete(next){ + const pending=pendingTrackDelete; + if(!pending?.acked||!next?.admitted||next.retained|| + pending.epoch!==next.device.epoch|| + BigInt(next.graph.revision)ch.id===pending.id))return; + pendingTrackDelete=null; + syncAddTrack(next); + nativeToast(pending.name+" deleted · native PCM and WIRE readback verified"); + } + function nativeOrbitTarget(track,slot){ + if(!track||!Number.isInteger(slot)||slot<0||slot>=8)return null; + const next=controller?.state()?.current,id=nativeIdFor(track); + const channel=next?.graph?.channels?.find(ch=>ch.id===id); + const insert=channel?.inserts?.[slot]; + if(next?.admitted&&!next.retained&&insert?.id&& + /dearvr\s*pro\s*2/i.test(insert.name||"")) + return {authority:"CHANNEL_ID",channelId:id,insertId:insert.id,slot}; + // Prior to native ChannelId takeover the verified M4 FX lease is the + // authoritative processor. Never guess by ordinal from a stale M4 list. + if(mixerSession()?.authority!=="M4"||!m4Verified())return null; + const picked=verifiedFxFor(track,slot); + const catalogName=nativeCatalog.get(picked?.live?.catalogId)?.name|| + track.fx?.[slot]||""; + if(!picked||!/dearvr\s*pro\s*2/i.test(catalogName))return null; + return {authority:"M4",channelId:"m4-lane-"+picked.lane, + lane:picked.lane,insertId:picked.live.instanceId,slot}; + } + function nativeOrbitAction(track,slot,kind,values={}){ + const target=nativeOrbitTarget(track,slot),next=controller?.state()?.current; + if(!target){nativeToast("Orbit target changed · reopen the dearVR FX menu");return false;} + if(!["inspect","start","stop"].includes(kind))return false; + const action=target.authority==="M4"? + (kind==="inspect"?"routingM4OrbitInspect": + kind==="start"?"routingM4OrbitStart":"routingM4OrbitStop"): + (kind==="inspect"?"routingNativeOrbitInspect": + kind==="start"?"routingNativeOrbitStart":"routingNativeOrbitStop"); + const identity=target.authority==="M4"? + {channel:target.lane,deviceEpoch:safeNativeCounter(hardware?.device?.epoch), + revision:safeNativeCounter(legacy()?.routingRevision)}: + {channelId:target.channelId,deviceEpoch:next.device.epoch, + graphRevision:next.graph.revision,rosterRevision:next.graph.rosterRevision}; + if(Object.values(identity).some(v=>v===null||v===undefined))return false; + backend.emitEvent("arMixAction",{ + action,...values,...identity,instanceId:target.insertId,slot:target.slot + }); + return true; + } function canCreateNativeTrack(next){ if(next?.retained)return false; if(next?.admitted) @@ -815,7 +890,7 @@ const button=document.getElementById("addTrack"); if(!button)return; const available=canCreateNativeTrack(next); - button.disabled=!available || !!pendingBusCreate; + button.disabled=!available || !!pendingBusCreate || !!pendingTrackDelete; button.title=available?"Add a stereo audio track routed to MAIN": "Connect a verified audio device in Audio I/O to add tracks"; } @@ -2057,6 +2132,8 @@ if(pendingBusCreate && pendingBusCreate.epoch!==next.device.epoch) pendingBusCreate=null; syncAddTrack(next); + if(pendingTrackDelete && pendingTrackDelete.epoch!==next?.device?.epoch) + pendingTrackDelete=null; const addBus=document.getElementById("addBus"); if(addBus){ addBus.hidden=!nativeAdmitted || @@ -2074,7 +2151,7 @@ pendingNativeSources.clear();pendingSourceQueue.clear(); activeNativeSource=null;nativeUiSourcePending=null; pendingOutputPatch=null;pendingNativeFxPower=null;pendingBusCreate=null; - pendingFxInsert=null;startupWire=null;activeWireAttempt=null; + pendingFxInsert=null;pendingTrackDelete=null;startupWire=null;activeWireAttempt=null; pendingWireGains.clear();pendingNativeControl.clear();liveFaderVisualTargets.clear(); const signature="retained|"+next.identity+"|"+appearanceRevision; if(lastPaintedSignature!==signature && projectNativeGraphWithoutFocusLoss(next)) @@ -2102,7 +2179,7 @@ const signature=next.identity+"|"+JSON.stringify(next.graph.channels.map(ch=>[ ch.id,ch.controls,ch.inserts,ch.fxRackBypassed,ch.primaryOutId]))+"|"+JSON.stringify(next.graph.edges)+"|"+appearanceRevision; if (signature===lastPaintedSignature) { - finishNativeTrack(next); + finishNativeTrack(next);finishNativeTrackDelete(next); // Telemetry often advances without a structural graph revision. paintNativeMeters(next); if(startupWire)window.queueMicrotask(flushStartupWire); @@ -2116,7 +2193,7 @@ flags.productionCallbackLive=next.productLive;flags.acceptedGraphConnected=true; syncMonitorButton(next.device); lastPaintedSignature=signature;stopDemo();paintNativeMeters(next); - finishNativeTrack(next); + finishNativeTrack(next);finishNativeTrackDelete(next); if(pendingFxInsert?.authority==="CHANNEL_ID"){ const p=pendingFxInsert; const inserted=next.graph.channels.find(ch=>ch.id===p.channelId) @@ -2242,6 +2319,19 @@ syncAddTrack(); controller?.subscribe(); }); + backend.addEventListener("arMixNativeTrackDeleteAck",ack=>{ + const pending=pendingTrackDelete; + if(!pending||pending.requestId!==ack?.requestId)return; + if(ack.ok!==true||ack.channelId!==pending.id){ + pendingTrackDelete=null;syncAddTrack(); + nativeToast("Delete Track rejected · "+(ack?.error||"native graph rejected")); + }else{ + pending.acked=true; + status(pending.name+" removal ACKed · verifying accepted graph"); + finishNativeTrackDelete(controller?.state()?.current); + } + controller?.subscribe(); + }); backend.addEventListener("arMixNativeFxPowerAck",ack=>{ const p=pendingNativeFxPower; if(!p||ack?.requestId!==p.requestId)return; @@ -2414,6 +2504,9 @@ } const nativeHooks=Object.freeze({ enabled:connected, + requestDeleteTrack:requestNativeTrackDelete, + orbitTarget:nativeOrbitTarget, + orbitAction:nativeOrbitAction, inputChoices(t) { if(t?.kind!=="audio")return ["None"]; if(controller?.state()?.current?.retained)return [t.input||"None"]; diff --git a/web/approved-native-context-menu.js b/web/approved-native-context-menu.js new file mode 100644 index 000000000..0a51dd47c --- /dev/null +++ b/web/approved-native-context-menu.js @@ -0,0 +1,216 @@ +// SPDX-License-Identifier: AGPL-3.0-only +// Native-only context surfaces; never mutate the Pages reference mixer or PCM. +(() => { + "use strict"; + const backend=window.__JUCE__?.backend; + const hooks=window.__ARMIX_NATIVE_M2__; + const scope=window.__ARMIX_NATIVE_SCOPE__; + if(!backend?.emitEvent||!backend?.addEventListener||!hooks?.enabled||!scope)return; + function install(){ + const css=document.createElement("style"); + css.textContent=[ + "#armixContext{position:fixed;z-index:10020;min-width:188px;max-width:260px;padding:4px;background:#152732;border:1px solid #4a7181;border-radius:6px;box-shadow:0 12px 28px #000b;color:#dcebf1;font:12px Inter,system-ui,sans-serif}", + "#armixContext[hidden],#armixOrbit[hidden]{display:none!important}", + "#armixContext button{display:block;width:100%;padding:8px 10px;border:0;border-radius:4px;background:transparent;color:inherit;text-align:left;font:inherit;cursor:pointer}", + "#armixContext button:hover,#armixContext button:focus-visible{background:#2a4c5b;color:#fff;outline:none}", + "#armixContext .danger{color:#ffc3bc}#armixContext .detail{font-size:10px;color:#a8bdc6;padding:5px 10px;line-height:1.5}", + "#armixOrbit{position:fixed;z-index:10018;width:324px;max-width:calc(100vw - 16px);max-height:calc(100vh - 16px);overflow-y:auto;padding:13px;background:#142832;color:#e1eef3;border:1px solid #4b7081;border-radius:8px;box-shadow:0 16px 38px #000b;font:12px Inter,system-ui,sans-serif}", + "#armixOrbit .head{display:flex;align-items:center;justify-content:space-between;gap:8px;margin-bottom:8px;font-size:14px;font-weight:550}", + "#armixOrbit .sub{color:#9cb8c3;font-size:11px;margin-bottom:12px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}", + "#armixOrbit label{display:block;font-size:10px;color:#9ebac6;margin-top:9px}", + "#armixOrbit select,#armixOrbit input{box-sizing:border-box;width:100%;height:29px;margin-top:3px;border:1px solid #486575;border-radius:4px;background:#0d1c25;color:#e2f3f7;padding:3px 7px;font:12px Inter,system-ui,sans-serif}", + "#armixOrbit .grid{display:grid;grid-template-columns:1fr 1fr;gap:0 9px}", + "#armixOrbit .foot{display:flex;gap:7px;margin-top:13px}#armixOrbit button{border:1px solid #52788a;border-radius:4px;background:#224858;color:#e1f5f9;padding:7px 9px;font:12px Inter,system-ui,sans-serif;cursor:pointer}", + "#armixOrbit .foot button{flex:1}#armixOrbit button:disabled{opacity:.35;cursor:default}", + "#armixOrbit .info{color:#9ebcc8;font-size:10px;line-height:1.5;margin-top:9px}", + "#armixOrbit .state{color:#92e3d3}#armixOrbit button.close{background:transparent;border:0;font-size:16px;padding:1px 6px}" + ].join("\n"); + document.head.appendChild(css); + const menu=document.createElement("div"); + menu.id="armixContext";menu.hidden=true;menu.setAttribute("role","menu"); + document.body.appendChild(menu); + const orbit=document.createElement("section"); + orbit.id="armixOrbit";orbit.hidden=true;orbit.setAttribute("role","dialog"); + orbit.setAttribute("aria-label","dearVR PRO 2 Orbit"); + orbit.innerHTML= + '
dearVR · Orbit
'+ + '
'+ + ''+ + ''+ + '
'+ + '
'+ + '
'+ + '
'+ + '
'+ + '
'+ + '
'+ + '
Reading verified VST3 parameters…
'; + document.body.appendChild(orbit); + let menuTrack=null,menuSlot=-1,menuTarget=null,confirmation=false; + let orbitTrack=null,orbitSlot=-1,orbitTarget=null,orbitState=null; + const $=id=>document.getElementById(id); + const dismissMenu=()=>{menu.hidden=true;menuTrack=null;menuSlot=-1;menuTarget=null;confirmation=false;}; + function place(el,x,y){ + el.style.left=Math.max(6,Math.min(x,window.innerWidth-(el.offsetWidth||222)-8))+"px"; + el.style.top=Math.max(6,Math.min(y,window.innerHeight-(el.offsetHeight||130)-8))+"px"; + } + function showMenu(x,y,kind){ + menu.hidden=false; + if(kind==="delete"){ + if(confirmation){ + menu.innerHTML='
Remove this audio track, its input, FX, and WIRE connections?
'+ + ''+ + ''; + }else menu.innerHTML=''; + }else menu.innerHTML=''; + place(menu,x,y); + menu.querySelector("[role=menuitem]")?.focus({preventScroll:true}); + } + function closeOrbit(){ + orbit.hidden=true;orbitTrack=null;orbitSlot=-1;orbitTarget=null;orbitState=null; + } + function orbitStillCurrent(){ + if(!orbitTrack||!orbitTarget)return false; + const actual=hooks.orbitTarget(orbitTrack,orbitSlot); + return actual?.insertId===orbitTarget.insertId && + actual?.channelId===orbitTarget.channelId && + actual?.authority===orbitTarget.authority; + } + function dispatchOrbit(kind,values={}){ + if(!orbitStillCurrent()){closeOrbit();return false;} + return hooks.orbitAction(orbitTrack,orbitSlot,kind,values); + } + function populate(select,values,chosen,emptyLabel){ + select.replaceChildren(); + if(!values.length){ + const option=new Option(emptyLabel,"-1");select.add(option);return; + } + values.forEach(p=>{select.add(new Option(p.name+" · "+p.minText+" / "+p.maxText,String(p.index)));}); + if(values.some(p=>p.index===chosen))select.value=String(chosen); + } + function validOrbitValues(){ + const shape=Number($("armixOrbitShape").value),az=Number($("armixOrbitAz").value), + distance=Number($("armixOrbitDistance").value),elevation=Number($("armixOrbitElevation").value), + near=Number($("armixOrbitNear").value),far=Number($("armixOrbitFar").value), + seconds=Number($("armixOrbitSeconds").value); + const needsDistance=[1,2,4,5].includes(shape),needsElevation=shape>=3; + const minimum=orbitState?.distanceUnit==="m"?orbitState.distanceMin:0; + const maximum=orbitState?.distanceUnit==="m"?orbitState.distanceMax:100; + return az>=0&&(!needsDistance||distance>=0)&&(!needsElevation||elevation>=0)&& + Number.isFinite(near)&&Number.isFinite(far)&&near>=minimum&&far<=maximum&& + near<=far&&seconds>=2&&seconds<=180&&Number.isFinite(seconds); + } + function paintOrbit(state){ + if(!orbitTarget||state?.channelId!==orbitTarget.channelId|| + state?.instanceId!==orbitTarget.insertId)return; + if(!orbitStillCurrent()){closeOrbit();return;} + const first=!orbitState; + orbitState=state; + const params=Array.isArray(state.parameters)?state.parameters:[]; + if(first){ + populate($("armixOrbitAz"),params.filter(p=>/azimuth/i.test(p.name)&&!/scale/i.test(p.name)), + state.preferredParameter,"Azimuth not exposed"); + populate($("armixOrbitDistance"),params.filter(p=>/distance/i.test(p.name)), + state.preferredDistance,"Distance not exposed"); + populate($("armixOrbitElevation"),params.filter(p=>/elevation/i.test(p.name)), + state.preferredElevation,"Elevation not exposed"); + $("armixOrbitNear").value=String(state.nearSetpoint??1); + $("armixOrbitFar").value=String(state.farSetpoint??3); + $("armixOrbitSeconds").value=String(state.periodSeconds??20); + $("armixOrbitReverse").value=String(Boolean(state.reverse)); + $("armixOrbitShape").value=String(state.shape??0); + } + const unit=state.distanceUnit==="m"?"m":"%"; + $("armixOrbitNear").previousElementSibling.textContent="Near ("+unit+")"; + $("armixOrbitFar").previousElementSibling.textContent="Far ("+unit+")"; + const active=state.active===true; + $("armixOrbitInfo").textContent=active? + "Orbit running · "+(state.polarMode==="MANUAL_REQUIRED"? + "Select POLAR in the dearVR editor if needed":state.polarMode||"verified"): + "Only this verified dearVR instance is controlled. The audio callback remains native."; + $("armixOrbitInfo").classList.toggle("state",active); + $("armixOrbitStop").disabled=!active; + $("armixOrbitStart").disabled=!validOrbitValues(); + } + // Give buttons identifiers without introducing a second UI renderer. + orbit.querySelector("[data-orbit-start]").id="armixOrbitStart"; + orbit.querySelector("[data-orbit-stop]").id="armixOrbitStop"; + document.addEventListener("contextmenu",e=>{ + // Never expose Chromium/WebView2 browser menu inside the native app. + e.preventDefault(); + dismissMenu(); + const header=e.target.closest?.(".strip-identity-top"); + const row=e.target.closest?.(".fxslot-row:not(.is-empty)"); + if(header){ + const track=scope.findTrack(header); + if(track?.kind!=="audio")return; // MAIN/BUS is not an input track. + menuTrack=track;menuSlot=-1; + showMenu(e.clientX,e.clientY,"delete");return; + } + if(row){ + const track=scope.findTrack(row),slot=Number(row.dataset.slot); + const target=hooks.orbitTarget(track,slot); + if(!target)return; + menuTrack=track;menuSlot=slot;menuTarget={...target}; + showMenu(e.clientX,e.clientY,"orbit"); + } + },true); + menu.addEventListener("click",e=>{ + const btn=e.target.closest("[data-menu]");if(!btn)return; + const action=btn.dataset.menu,track=menuTrack,slot=menuSlot; + const selected=menuTarget; + if(action==="delete"){ + confirmation=true;showMenu(menu.offsetLeft,menu.offsetTop,"delete");return; + } + dismissMenu(); + if(action==="confirm"){hooks.requestDeleteTrack(track);return;} + if(action!=="orbit")return; + const actual=hooks.orbitTarget(track,slot); + if(!selected||selected.insertId!==actual?.insertId|| + selected.channelId!==actual?.channelId|| + selected.authority!==actual?.authority)return; + orbitTrack=track;orbitSlot=slot;orbitTarget=selected; + orbitState=null;orbit.hidden=false; + $("armixOrbitTarget").textContent=track.name+" · FX "+(slot+1); + $("armixOrbitInfo").textContent="Reading verified VST3 parameters…"; + $("armixOrbitStart").disabled=true;$("armixOrbitStop").disabled=true; + place(orbit,Math.max(12,menu.offsetLeft-30),Math.max(12,menu.offsetTop-8)); + dispatchOrbit("inspect",{shape:Number($("armixOrbitShape").value)}); + }); + backend.addEventListener("arMixNativeOrbitState",paintOrbit); + orbit.addEventListener("click",e=>{ + if(e.target.closest("[data-orbit-close]")){closeOrbit();return;} + if(!orbitTrack)return; + if(e.target.closest("[data-orbit-stop]")){dispatchOrbit("stop");return;} + if(!e.target.closest("[data-orbit-start]")||!validOrbitValues())return; + dispatchOrbit("start",{ + shape:Number($("armixOrbitShape").value), + parameterIndex:Number($("armixOrbitAz").value), + distanceIndex:Number($("armixOrbitDistance").value), + elevationIndex:Number($("armixOrbitElevation").value), + nearDistance:Number($("armixOrbitNear").value), + farDistance:Number($("armixOrbitFar").value), + distanceUnit:orbitState?.distanceUnit||"%", + seconds:Number($("armixOrbitSeconds").value), + reverse:$("armixOrbitReverse").value==="true" + }); + }); + orbit.addEventListener("input",()=>{if(orbitState)$("armixOrbitStart").disabled=!validOrbitValues();}); + $("armixOrbitShape").addEventListener("change",()=>{ + if(orbitTrack)dispatchOrbit("inspect",{shape:Number($("armixOrbitShape").value)}); + }); + document.addEventListener("pointerdown",e=>{ + if(!menu.hidden&&!menu.contains(e.target))dismissMenu(); + },true); + document.addEventListener("keydown",e=>{ + if(e.key!=="Escape")return; + if(!menu.hidden){e.preventDefault();e.stopImmediatePropagation();dismissMenu();} + else if(!orbit.hidden){e.preventDefault();e.stopImmediatePropagation();closeOrbit();} + },true); + window.addEventListener("blur",dismissMenu); + window.addEventListener("resize",dismissMenu); + document.addEventListener("scroll",dismissMenu,true); + } + if(document.readyState==="loading")document.addEventListener("DOMContentLoaded",install,{once:true}); + else install(); +})(); \ No newline at end of file