supersonic-scsynth 0.4.0 → 0.6.0

package/dist/workers/scsynth_audio_worklet.js

@@ -143,6 +143,38 @@ class ScsynthProcessor extends AudioWorkletProcessor {
 
     }
 
+    // Write worldOptions to SharedArrayBuffer for C++ to read
+    // WorldOptions are written after ring buffer storage (65536 bytes)
+    writeWorldOptionsToMemory() {
+        if (!this.worldOptions || !this.wasmMemory) {
+            return;
+        }
+
+        // WorldOptions location: ringBufferBase + 65536 (after ring_buffer_storage)
+        const WORLD_OPTIONS_OFFSET = this.ringBufferBase + 65536;
+        const uint32View = new Uint32Array(this.wasmMemory.buffer, WORLD_OPTIONS_OFFSET, 32);
+        const float32View = new Float32Array(this.wasmMemory.buffer, WORLD_OPTIONS_OFFSET, 32);
+
+        // Write worldOptions as uint32/float32 values
+        // Order must match C++ reading code in audio_processor.cpp
+        uint32View[0] = this.worldOptions.numBuffers || 1024;
+        uint32View[1] = this.worldOptions.maxNodes || 1024;
+        uint32View[2] = this.worldOptions.maxGraphDefs || 1024;
+        uint32View[3] = this.worldOptions.maxWireBufs || 64;
+        uint32View[4] = this.worldOptions.numAudioBusChannels || 128;
+        uint32View[5] = this.worldOptions.numInputBusChannels || 0;
+        uint32View[6] = this.worldOptions.numOutputBusChannels || 2;
+        uint32View[7] = this.worldOptions.numControlBusChannels || 4096;
+        uint32View[8] = this.worldOptions.bufLength || 128;
+        uint32View[9] = this.worldOptions.realTimeMemorySize || 16384;
+        uint32View[10] = this.worldOptions.numRGens || 64;
+        uint32View[11] = this.worldOptions.realTime ? 1 : 0;
+        uint32View[12] = this.worldOptions.memoryLocking ? 1 : 0;
+        uint32View[13] = this.worldOptions.loadGraphDefs || 0;
+        uint32View[14] = this.worldOptions.preferredSampleRate || 0;
+        uint32View[15] = this.worldOptions.verbosity || 0;
+    }
+
     // Write debug message to SharedArrayBuffer DEBUG ring buffer
     js_debug(message) {
         if (!this.uint8View || !this.atomicView || !this.CONTROL_INDICES || !this.ringBufferBase) {
@@ -217,6 +249,10 @@ class ScsynthProcessor extends AudioWorkletProcessor {
                     // Save memory reference for later use (WASM imports memory, doesn't export it)
                     this.wasmMemory = memory;
 
+                    // Store worldOptions and sampleRate for C++ initialization
+                    this.worldOptions = data.worldOptions || {};
+                    this.sampleRate = data.sampleRate || 48000;  // Fallback to 48000 if not provided
+
                     // Import object for WASM
                     // scsynth with pthread support requires these imports
                     // (pthread stubs are no-ops - AudioWorklet is single-threaded)
@@ -271,9 +307,13 @@ class ScsynthProcessor extends AudioWorkletProcessor {
 
                         this.calculateBufferIndices(this.ringBufferBase);
 
+                        // Write worldOptions to SharedArrayBuffer for C++ to read
+                        this.writeWorldOptionsToMemory();
+
                         // Initialize WASM memory
                         if (this.wasmInstance.exports.init_memory) {
-                            this.wasmInstance.exports.init_memory(48000.0);
+                            // Pass actual sample rate from AudioContext (not hardcoded!)
+                            this.wasmInstance.exports.init_memory(this.sampleRate);
 
                             this.isInitialized = true;
 
@@ -299,9 +339,13 @@ class ScsynthProcessor extends AudioWorkletProcessor {
 
                         this.calculateBufferIndices(this.ringBufferBase);
 
+                        // Write worldOptions to SharedArrayBuffer for C++ to read
+                        this.writeWorldOptionsToMemory();
+
                         // Initialize WASM memory
                         if (this.wasmInstance.exports.init_memory) {
-                            this.wasmInstance.exports.init_memory(48000.0);
+                            // Pass actual sample rate from AudioContext (not hardcoded!)
+                            this.wasmInstance.exports.init_memory(this.sampleRate);
 
                             this.isInitialized = true;
 
@@ -317,59 +361,6 @@ class ScsynthProcessor extends AudioWorkletProcessor {
                 }
             }
 
-            if (data.type === 'getMetrics') {
-                // Return current metrics (only if initialized)
-                if (this.atomicView && this.METRICS_INDICES && this.CONTROL_INDICES && this.bufferConstants) {
-                    // Calculate buffer usage percentages (use constants from WASM)
-                    const IN_BUFFER_SIZE = this.bufferConstants.IN_BUFFER_SIZE;
-                    const OUT_BUFFER_SIZE = this.bufferConstants.OUT_BUFFER_SIZE;
-                    const DEBUG_BUFFER_SIZE = this.bufferConstants.DEBUG_BUFFER_SIZE;
-
-                    const inHead = Atomics.load(this.atomicView, this.CONTROL_INDICES.IN_HEAD);
-                    const inTail = Atomics.load(this.atomicView, this.CONTROL_INDICES.IN_TAIL);
-                    const inUsed = (inHead - inTail + IN_BUFFER_SIZE) % IN_BUFFER_SIZE;
-                    const inPercentage = Math.round((inUsed / IN_BUFFER_SIZE) * 100);
-
-                    const outHead = Atomics.load(this.atomicView, this.CONTROL_INDICES.OUT_HEAD);
-                    const outTail = Atomics.load(this.atomicView, this.CONTROL_INDICES.OUT_TAIL);
-                    const outUsed = (outHead - outTail + OUT_BUFFER_SIZE) % OUT_BUFFER_SIZE;
-                    const outPercentage = Math.round((outUsed / OUT_BUFFER_SIZE) * 100);
-
-                    const debugHead = Atomics.load(this.atomicView, this.CONTROL_INDICES.DEBUG_HEAD);
-                    const debugTail = Atomics.load(this.atomicView, this.CONTROL_INDICES.DEBUG_TAIL);
-                    const debugUsed = (debugHead - debugTail + DEBUG_BUFFER_SIZE) % DEBUG_BUFFER_SIZE;
-                    const debugPercentage = Math.round((debugUsed / DEBUG_BUFFER_SIZE) * 100);
-
-                    const metrics = {
-                        processCount: Atomics.load(this.atomicView, this.METRICS_INDICES.PROCESS_COUNT),
-                        bufferOverruns: Atomics.load(this.atomicView, this.METRICS_INDICES.BUFFER_OVERRUNS),
-                        messagesProcessed: Atomics.load(this.atomicView, this.METRICS_INDICES.MESSAGES_PROCESSED),
-                        messagesDropped: Atomics.load(this.atomicView, this.METRICS_INDICES.MESSAGES_DROPPED),
-                        schedulerQueueDepth: Atomics.load(this.atomicView, this.METRICS_INDICES.SCHEDULER_QUEUE_DEPTH),
-                        schedulerQueueMax: Atomics.load(this.atomicView, this.METRICS_INDICES.SCHEDULER_QUEUE_MAX),
-                        schedulerQueueDropped: Atomics.load(this.atomicView, this.METRICS_INDICES.SCHEDULER_QUEUE_DROPPED),
-                        statusFlags: Atomics.load(this.atomicView, this.CONTROL_INDICES.STATUS_FLAGS),
-                        inBufferUsed: {
-                            bytes: inUsed,
-                            percentage: inPercentage
-                        },
-                        outBufferUsed: {
-                            bytes: outUsed,
-                            percentage: outPercentage
-                        },
-                        debugBufferUsed: {
-                            bytes: debugUsed,
-                            percentage: debugPercentage
-                        }
-                    };
-
-                    this.port.postMessage({
-                        type: 'metrics',
-                        metrics: metrics
-                    });
-                }
-            }
-
             if (data.type === 'getVersion') {
                 // Return Supersonic/SuperCollider version string
                 if (this.wasmInstance && this.wasmInstance.exports.get_supersonic_version_string) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supersonic-scsynth",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "SuperCollider scsynth WebAssembly port for AudioWorklet - Run SuperCollider synthesis in the browser",
   "main": "dist/supersonic.js",
   "unpkg": "dist/supersonic.js",