Skip to content

Rework registerExtensionAudioContext (GUI) #142

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

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft
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
23 changes: 18 additions & 5 deletions src/addons/addons/mediarecorder/userscript.js
Original file line number Diff line number Diff line change
Expand Up @@ -323,12 +323,25 @@ export default async ({ addon, console, msg }) => {
vm.runtime.audioEngine.inputNode.connect(mediaStreamDestination);
const audioSource = ctx.createMediaStreamSource(mediaStreamDestination.stream);
audioSource.connect(dest);
// literally any other extension
for (const audioData of vm.runtime._extensionAudioObjects.values()) {
if (audioData.audioContext && audioData.gainNode) {
const mediaStreamDestination = audioData.audioContext.createMediaStreamDestination();
audioData.gainNode.connect(mediaStreamDestination);

// connecting extensions to the media stream
for (const extensionInformation of vm.runtime._extensionIntegrationObjects.values()) {
if (extensionInformation.whitelistUsed && !extensionInformation.whitelist.includes("audioMediaStream")) continue;
// map destination AudioNodes to their AudioContexts
const contextMap = new Map();
for (const audioNode of extensionInformation.audioNodes) {
const nodeArray = contextMap.get(audioNode.context) || [];
nodeArray.push(audioNode);
contextMap.set(audioNode.context, nodeArray);
}
// make media stream destinations, connect destination nodes from each context to the stream
for (const audioContext of extensionInformation.audioContexts) {
const mediaStreamDestination = audioContext.createMediaStreamDestination();
const audioSource = ctx.createMediaStreamSource(mediaStreamDestination.stream);
const audioNodes = contextMap.get(audioContext);
for (const audioNode of audioNodes) {
audioNode.connect(mediaStreamDestination);
}
audioSource.connect(dest);
}
}
Expand Down
16 changes: 10 additions & 6 deletions src/addons/addons/vol-slider/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ const callbacks = [];
export const setVolume = (newVolume) => {
if (gainNode) {
gainNode.value = newVolume;

// literally any other extension
for (const audioData of globalVm.runtime._extensionAudioObjects.values()) {
if (audioData.gainNode) {
audioData.gainNode.gain.value = gainNode.value;
for (const extensionInformation of vm.runtime._extensionIntegrationObjects.values()) {
if (extensionInformation.whitelistUsed && !extensionInformation.whitelist.includes("gainNodeSet")) continue;
for (const extensionGainNode of extensionInformation.gainNodes) {
extensionGainNode.gain.value = gainNode.value;
}
}
} else {
Expand Down Expand Up @@ -58,10 +60,12 @@ const gotAudioEngine = (audioEngine) => {
}
gainNode = audioEngine.inputNode.gain;
gainNode.value = volumeBeforeFinishSetup;

// literally any other extension
for (const audioData of globalVm.runtime._extensionAudioObjects.values()) {
if (audioData.gainNode) {
audioData.gainNode.gain.value = gainNode.value;
for (const extensionInformation of vm.runtime._extensionIntegrationObjects.values()) {
if (extensionInformation.whitelistUsed && !extensionInformation.whitelist.includes("gainNodeSet")) continue;
for (const extensionGainNode of extensionInformation.gainNodes) {
extensionGainNode.gain.value = gainNode.value;
}
}
};
Expand Down
Loading