Moved toIndex() helpers to the worklet

Author: cwoffenden

src/audio_worklet.js

@@ -29,8 +29,8 @@ function createWasmAudioWorkletProcessor(audioParams) {
 
       // Capture the Wasm function callback to invoke.
       let opts = args.processorOptions;
-      this.callbackFunction = Module['wasmTable'].get(opts['cb']);
-      this.userData = opts['ud'];
+      this.callbackFunction = Module['wasmTable'].get({{{ toIndexType("opts['cb']") }}});
+      this.userData = {{{ toIndexType("opts['ud']") }}};
 
       // Then the samples per channel to process, fixed for the lifetime of the
       // context that created this processor. Even though this 'render quantum
@@ -273,9 +273,9 @@ class BootstrapMessages extends AudioWorkletProcessor {
         // 'cb' the callback function
         // 'ch' the context handle
         // 'ud' the passed user data
-        p.postMessage({'_wsc': d['cb'], 'x': [d['ch'], 1/*EM_TRUE*/, d['ud']] });
+        p.postMessage({'_wsc': {{{ toIndexType("d['cb']") }}}, 'x': [d['ch'], 1/*EM_TRUE*/, {{{ toIndexType("d['ud']") }}}] });
       } else if (d['_wsc']) {
-        Module['wasmTable'].get({{{ toIndexType('d[\'_wsc\']') }}})(...d['x']);
+        Module['wasmTable'].get({{{ toIndexType("d['_wsc']") }}})(...d['x']);
       };
     }
   }

src/lib/libwebaudio.js

@@ -251,7 +251,6 @@ let LibraryWebAudio = {
       audioParamDescriptors = {{{ makeGetValue('options', C_STRUCTS.WebAudioWorkletProcessorCreateOptions.audioParamDescriptors, '*') }}},
       i = 0;
 
-    // TODO: add tests and wire this up
     while (numAudioParams--) {
       audioParams.push({
         name: i++,
@@ -277,8 +276,8 @@ let LibraryWebAudio = {
       '_wpn': processorName,
       'ap': audioParams,
       'ch': contextHandle,
-      'cb': {{{ toIndexType('callback') }}},
-      'ud': {{{ toIndexType('userData') }}}
+      'cb': callback,
+      'ud': userData
     });
   },
 
@@ -290,7 +289,6 @@ let LibraryWebAudio = {
     assert(EmAudio[contextHandle] instanceof (window.AudioContext || window.webkitAudioContext), `Called emscripten_create_wasm_audio_worklet_node() on a context handle ${contextHandle} that is not an AudioContext, but of type ${typeof EmAudio[contextHandle]}`);
 #endif
 
-    // TODO: this next
     function readChannelCountArray(heapIndex, numOutputs) {
       if (!heapIndex) return void 0;
       heapIndex = {{{ getHeapOffset('heapIndex', 'i32') }}};
@@ -305,8 +303,8 @@ let LibraryWebAudio = {
       numberOfOutputs: optionsOutputs,
       outputChannelCount: readChannelCountArray({{{ makeGetValue('options', C_STRUCTS.EmscriptenAudioWorkletNodeCreateOptions.outputChannelCounts, 'i32*') }}}, optionsOutputs),
       processorOptions: {
-        'cb': {{{ toIndexType('callback') }}},
-        'ud': {{{ toIndexType('userData') }}},
+        'cb': callback,
+        'ud': userData,
         'sc': emscriptenGetContextQuantumSize(contextHandle)
       }
     } : void 0;