forked from abh1nash/ace-daw
-
Notifications
You must be signed in to change notification settings - Fork 7
feat: wire aux sends to audio engine with pre/post fader toggle #1039
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,16 @@ | ||
| import * as Tone from 'tone'; | ||
| import { TrackNode } from './TrackNode'; | ||
| import { ReturnTrackNode } from './ReturnTrackNode'; | ||
| import type { | ||
| AudioWarpMarker, | ||
| GainEnvelopePoint, | ||
| MasteringState, | ||
| ReturnTrack, | ||
| Send, | ||
| SequencerPattern, | ||
| TempoEvent, | ||
| TimeSignatureEvent, | ||
| Track, | ||
| } from '../types/project'; | ||
| import { ensureMasteringState } from '../utils/mastering'; | ||
| import { applyClipFadeAutomation } from '../utils/clipFade'; | ||
|
|
@@ -84,6 +88,7 @@ export class AudioEngine { | |
| ctx: AudioContext; | ||
| masterGain: GainNode; | ||
| trackNodes: Map<string, TrackNode> = new Map(); | ||
| returnTrackNodes: Map<string, ReturnTrackNode> = new Map(); | ||
| scheduledSources: ScheduledSource[] = []; | ||
| private readonly masterInputGain: GainNode; | ||
| private readonly masterDryGain: GainNode; | ||
|
|
@@ -1127,13 +1132,104 @@ export class AudioEngine { | |
| } | ||
| } | ||
|
|
||
| // ----------------------------------------------------------------------- | ||
| // Return Track Nodes & Send Routing | ||
| // ----------------------------------------------------------------------- | ||
|
|
||
| getOrCreateReturnTrackNode(returnTrackId: string): ReturnTrackNode { | ||
| let node = this.returnTrackNodes.get(returnTrackId); | ||
| if (!node) { | ||
| node = new ReturnTrackNode(this.ctx, this.masterInputGain); | ||
| this.returnTrackNodes.set(returnTrackId, node); | ||
| } | ||
| return node; | ||
| } | ||
|
|
||
| removeReturnTrackNode(returnTrackId: string) { | ||
| const node = this.returnTrackNodes.get(returnTrackId); | ||
| if (node) { | ||
| node.disconnect(); | ||
| this.returnTrackNodes.delete(returnTrackId); | ||
| } | ||
| } | ||
|
|
||
| getReturnTrackMeter(returnTrackId: string): { level: number; leftLevel: number; rightLevel: number; clipped: boolean } { | ||
| return this.returnTrackNodes.get(returnTrackId)?.getMeter() ?? { level: 0, leftLevel: 0, rightLevel: 0, clipped: false }; | ||
| } | ||
|
|
||
| resetReturnTrackClip(returnTrackId: string) { | ||
| this.returnTrackNodes.get(returnTrackId)?.resetClip(); | ||
| } | ||
|
|
||
| /** | ||
| * Synchronize send routing between tracks and return tracks. | ||
| * Creates/updates ReturnTrackNodes, wires send gain nodes, and cleans up stale connections. | ||
| */ | ||
| syncSends(tracks: Track[], returnTracks: ReturnTrack[]) { | ||
| const returnTrackIds = new Set(returnTracks.map(rt => rt.id)); | ||
|
|
||
| // 1. Create/update ReturnTrackNodes | ||
| for (const rt of returnTracks) { | ||
| const node = this.getOrCreateReturnTrackNode(rt.id); | ||
| node.volume = rt.volume; | ||
| node.pan = rt.pan; | ||
| } | ||
|
|
||
| // 2. Remove ReturnTrackNodes that no longer exist in the data model | ||
| for (const [id] of this.returnTrackNodes) { | ||
| if (!returnTrackIds.has(id)) { | ||
| this.removeReturnTrackNode(id); | ||
| } | ||
| } | ||
|
|
||
| // 3. Wire sends for each track | ||
| const activeSends = new Map<string, Set<string>>(); | ||
|
|
||
| for (const track of tracks) { | ||
| const trackNode = this.trackNodes.get(track.id); | ||
| if (!trackNode) continue; | ||
|
|
||
| const sends = track.sends ?? []; | ||
| const activeReturnIds = new Set<string>(); | ||
|
|
||
| for (const send of sends) { | ||
| if (!returnTrackIds.has(send.returnTrackId)) continue; | ||
| if (send.amount <= 0) continue; | ||
|
|
||
| const returnNode = this.returnTrackNodes.get(send.returnTrackId); | ||
| if (!returnNode) continue; | ||
|
|
||
| activeReturnIds.add(send.returnTrackId); | ||
| trackNode.connectSend(send.returnTrackId, returnNode.inputGain, send.amount, (send.prePost ?? 'post') === 'pre'); | ||
| } | ||
|
|
||
| activeSends.set(track.id, activeReturnIds); | ||
| } | ||
|
|
||
| // 4. Disconnect sends that are no longer active | ||
| for (const track of tracks) { | ||
| const trackNode = this.trackNodes.get(track.id); | ||
| if (!trackNode) continue; | ||
| const active = activeSends.get(track.id) ?? new Set(); | ||
| for (const send of (track.sends ?? [])) { | ||
| if (send.amount <= 0 && !active.has(send.returnTrackId)) { | ||
| trackNode.disconnectSend(send.returnTrackId); | ||
| } | ||
| } | ||
| } | ||
|
Comment on lines
+1185
to
+1219
|
||
| } | ||
|
|
||
| dispose() { | ||
| this.stop(); | ||
| this.disposeAudioStream(); | ||
| for (const node of this.trackNodes.values()) { | ||
| node.disconnect(); | ||
| } | ||
| this.trackNodes.clear(); | ||
| for (const node of this.returnTrackNodes.values()) { | ||
| node.disconnect(); | ||
| } | ||
| this.returnTrackNodes.clear(); | ||
| this.ctx.close(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
syncSends()callstrackNode.connectSend(...)on every sync pass, andconnectSend()always disconnects and recreates the GainNodes. SinceuseTransportcallssyncSendsduring live parameter updates, this can cause unnecessary audio-graph churn (and potentially clicks because initial gain values are set immediately, not ramped). Prefer creating the send once and then callingtrackNode.updateSendAmount(...)when only amount/preFader changes, and only recreate connections when the destination return node changes.