add extra fillSampleBufferWithNumSamples to exported wasm methods

petersalomonsen · Feb 10, 2024 · 23bccaf · 23bccaf
1 parent 79c25e7
commit 23bccaf
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/wasmaudioworklet/synth1/assembly/__tests__/midi/midisynth.spec.ts b/wasmaudioworklet/synth1/assembly/__tests__/midi/midisynth.spec.ts
@@ -117,7 +117,7 @@ class UpperKeys extends MidiVoice {
 
 class LinearVoice extends MidiVoice {
   pos: f32 = 0.0;
-  nextframe(): void {    
+  nextframe(): void {
     const val = this.pos / 128;
     this.channel.signal.add(val, val);
     this.pos++;
@@ -686,17 +686,17 @@ describe("midisynth", () => {
     for (let n = 0; n < 64; n++) {
       expect<f32>(samplebuffer[n]).toBe((n / 128.0) as f32);
     }
-    
+
     for (let n = 64; n < 128; n++) {
       expect<f32>(samplebuffer[n]).toBe(0);
     }
 
     fillSampleBufferWithNumSamples(64);
-    
+
     for (let n = 0; n < 64; n++) {
-      expect<f32>(samplebuffer[n]).toBe(((n+64) / 128.0) as f32);
+      expect<f32>(samplebuffer[n]).toBe(((n + 64) / 128.0) as f32);
     }
-    
+
     for (let n = 64; n < 128; n++) {
       expect<f32>(samplebuffer[n]).toBe(0);
     }

diff --git a/wasmaudioworklet/synth1/assembly/midi/midisynth.ts b/wasmaudioworklet/synth1/assembly/midi/midisynth.ts
@@ -83,7 +83,7 @@ export class MidiChannel {
             if (voice.note === note) {
                 if (this.controllerValues[CONTROL_SUSTAIN] >= 64) {
                     this.sustainedVoices[note] = voice;
-                } else {                    
+                } else {
                     voice.noteoff();
                 }
                 break;
@@ -142,15 +142,15 @@ export class MidiChannel {
         }
         if (oldestVoice !== null) {
             const voice = (oldestVoice as MidiVoice);
-            for (let n = 0;n<sampleBufferFrames;n++) {
+            for (let n = 0; n < sampleBufferFrames; n++) {
                 voice.nextframe();
                 const fact: f32 = ((sampleBufferFrames as f32) - (n as f32)) / (sampleBufferFrames as f32);
-                this.voiceTransitionBuffer[n<<1] += this.signal.left * fact;
-                this.voiceTransitionBuffer[(n<<1) + 1] += this.signal.right * fact;
+                this.voiceTransitionBuffer[n << 1] += this.signal.left * fact;
+                this.voiceTransitionBuffer[(n << 1) + 1] += this.signal.right * fact;
                 this.signal.clear();
             }
             voice.activationCount = voiceActivationCount++;
-            this.removeFromSustainedVoices(voice);                        
+            this.removeFromSustainedVoices(voice);
         }
         return oldestVoice;
     }
@@ -237,10 +237,10 @@ export function shortmessage(val1: u8, val2: u8, val3: u8): void {
 }
 
 export function getActiveVoicesStatusSnapshot(): usize {
-    for (let n=0;n<activeVoices.length;n++) {
+    for (let n = 0; n < activeVoices.length; n++) {
         const activeVoicesStatusSnapshotIndex = n * 3;
-        if (activeVoices[n] != null) {    
-            const voice = (activeVoices[n] as MidiVoice);        
+        if (activeVoices[n] != null) {
+            const voice = (activeVoices[n] as MidiVoice);
             activeVoicesStatusSnapshot[activeVoicesStatusSnapshotIndex] = voice.channelNo;
             activeVoicesStatusSnapshot[activeVoicesStatusSnapshotIndex + 1] = voice.note;
             activeVoicesStatusSnapshot[activeVoicesStatusSnapshotIndex + 2] = voice.velocity;
@@ -303,11 +303,11 @@ export function fillSampleBufferWithNumSamples(numSamples: i32): void {
 
             channelsignal.left += midichannel.voiceTransitionBuffer[voiceTransitionBufferNdx];
             midichannel.voiceTransitionBuffer[voiceTransitionBufferNdx] = 0;
-            channelsignal.right +=midichannel.voiceTransitionBuffer[voiceTransitionBufferNdx+1];
-            midichannel.voiceTransitionBuffer[voiceTransitionBufferNdx+1] = 0;
-            
-            midichannel.preprocess();            
-                        
+            channelsignal.right += midichannel.voiceTransitionBuffer[voiceTransitionBufferNdx + 1];
+            midichannel.voiceTransitionBuffer[voiceTransitionBufferNdx + 1] = 0;
+
+            midichannel.preprocess();
+
             channelsignal.left *= midichannel.pan.leftLevel * midichannel.volume;
             channelsignal.right *= midichannel.pan.rightLevel * midichannel.volume;
 

diff --git a/wasmaudioworklet/synth1/assembly/mixes/globalimports.ts b/wasmaudioworklet/synth1/assembly/mixes/globalimports.ts
@@ -63,6 +63,7 @@ export { sampleBufferFrames } from '../midi/midisynth';
 export { sampleBufferBytesPerChannel } from '../midi/midisynth';
 export { sampleBufferChannels } from '../midi/midisynth';
 export { samplebuffer } from '../midi/midisynth';
+export { freeverb } from '../midi/midisynth';
 export { outputline } from '../midi/midisynth';
 export { MidiChannel } from '../midi/midisynth';
 export { MidiVoice } from '../midi/midisynth';

diff --git a/wasmaudioworklet/synth1/browsercompilerwebworker.js b/wasmaudioworklet/synth1/browsercompilerwebworker.js
@@ -28,7 +28,7 @@ function createWebAssemblySongData(song, mode = EXPORT_MODE_MIDISYNTH_MULTIPART_
             export const midipartschedule: MidiSequencerPartSchedule[] = [new MidiSequencerPartSchedule(0, 0)];
         `;
         assemblyscriptsynthsources[wasi_main_src] = `
-            export { fillSampleBuffer, samplebuffer, allNotesOff, shortmessage, getActiveVoicesStatusSnapshot } from './midi/midisynth';
+            export { fillSampleBuffer, fillSampleBufferWithNumSamples, samplebuffer, allNotesOff, shortmessage, getActiveVoicesStatusSnapshot } from './midi/midisynth';
             export { seek, playEventsAndFillSampleBuffer, currentTimeMillis } from './midi/sequencer/midisequencer';
             import { midipartschedule } from './midi/sequencer/midiparts';
 

diff --git a/wasmaudioworklet/synth1/wasmsynthassemblyscriptsources.json b/wasmaudioworklet/synth1/wasmsynthassemblyscriptsources.json