diff --git a/architecture/webaudio/webaudio-wasm-wrapper.js b/architecture/webaudio/webaudio-wasm-wrapper.js index 15b1bec553..a72baad253 100644 --- a/architecture/webaudio/webaudio-wasm-wrapper.js +++ b/architecture/webaudio/webaudio-wasm-wrapper.js @@ -305,115 +305,6 @@ faust.compileCode = function (factory_name, code, argv, internal_memory) factory_code[i] = faust_module.HEAP8[factory_code_ptr + i]; } - //=========================== - // New API test - //=========================== - - console.log("New API test"); - - //var code = "process = _,_,_,_;"; - //var code = "import(\"stdfaust.lib\"); process = dm.zita_rev1;"; - //var code = "import(\"stdfaust.lib\"); vol = vslider(\"vol\", 0.6, 0, 1, 0.01); process = _+vol,_+(0.3*vol);"; - //var code = "import(\"stdfaust.lib\"); vol = vslider(\"vol\", 0.6, 0, 1, 0.01); process = (_+vol)*os.osc(440),_+(0.3*vol*os.osc(800));"; - //var code = "process = (_+0.5),(_+0.7);"; - //var code = "import(\"stdfaust.lib\"); process = os.osc(440);"; - - var code = "import(\"stdfaust.lib\"); process = os.osc(nentry(\"freq\", 440, 200, 5000, 10))*nentry(\"gain\", 0.5, 0, 1, 0.01)*button(\"gate\"); effect = _*0.5,_*0.7;" - - //var code = "import(\"stdfaust.lib\"); process = os.osc(nentry(\"freq\", 440, 200, 5000, 10))*nentry(\"gain\", 0.5, 0, 1, 0.01)*button(\"gate\");" - - console.log(code); - - var argv1 = faust_module.makeStringVector(); - console.log(argv1); - argv1.push_back("-ftz"); - argv1.push_back("2"); - argv1.push_back("-cn"); - argv1.push_back(factory_name); - argv1.push_back("-I"); - argv1.push_back("http://127.0.0.1:8000/libraries/"); - - var time3 = performance.now(); - //var factory_ptr = faust_module.wasm_dynamic_dsp_factory.createWasmDSPFactoryFromString2("FaustDSP", code, argv1, false); - - var factory_ptr = faust_module.wasm_dsp_poly_factory.createWasmPolyDSPFactoryFromString2("FaustDSP", code, argv1, false); - - var time4 = performance.now(); - console.log("C++ Faust compilation duration : " + (time4 - time3)); - - // Test extractJSON - var test_json = faust_module.wasm_dsp_factory.extractJSON(factory_code); - console.log("EXTRACT JSON : " + test_json); - - if (factory_ptr) { - console.log("factory_ptr " + factory_ptr); - //var instance_ptr = factory_ptr.createDSPInstance(); - var instance_ptr = factory_ptr.createPolyDSPInstance(8, true, true); - - instance_ptr.init(44100); - - // Test MIDI - instance_ptr.keyOn(0, 60, 100); - instance_ptr.keyOn(0, 67, 100); - instance_ptr.keyOn(0, 75, 100); - - //instance_ptr.computeJSTest(128); - - var js_inputs = faust_module.wasm_dsp_factory.createAudioBuffers(instance_ptr.getNumInputs(), 128); - var js_outputs = faust_module.wasm_dsp_factory.createAudioBuffers(instance_ptr.getNumOutputs(), 128); - - //console.log("instance_ptr1.compute " + instance_ptr1.compute); - - instance_ptr.compute(128, js_inputs, js_outputs); - - faust_module.wasm_dsp_factory.printAudioBuffers(js_outputs, instance_ptr.getNumOutputs(), 128); - - faust_module.wasm_dsp_factory.deleteAudioBuffers(js_inputs, instance_ptr.getNumInputs()); - faust_module.wasm_dsp_factory.deleteAudioBuffers(js_outputs, instance_ptr.getNumOutputs()); - - instance_ptr.keyOff(0, 60, 100); - instance_ptr.keyOff(0, 67, 100); - instance_ptr.keyOff(0, 75, 100); - - console.log("instance_ptr " + instance_ptr); - console.log("instance_ptr getNumInputs " + instance_ptr.getNumInputs()); - console.log("instance_ptr getNumOutputs " + instance_ptr.getNumOutputs()); - - //instance_ptr.computeJSTest(128); - //instance_ptr.compute(128, 0, 0); - - } else { - console.log("getErrorMessage " + faust_module.wasm_dsp_factory.getErrorMessage()); - } - - fetch('t1.wasm') - .then(dsp_file => dsp_file.arrayBuffer()) - .then(dsp_bytes => { var factory_ptr1 = faust_module.wasm_dsp_factory.readWasmDSPFactoryFromMachine2(dsp_bytes); - console.log("factory_ptr1 " + factory_ptr); - var instance_ptr1 = factory_ptr1.createDSPInstance(); - console.log("instance_ptr1 " + instance_ptr1); - console.log("instance_ptr1 getNumInputs " + instance_ptr1.getNumInputs()); - console.log("instance_ptr1 getNumOutputs " + instance_ptr1.getNumOutputs()); - - //console.log("faust_module.wasm_dsp_factory.createAudioBuffers " + faust_module.wasm_dsp_factory.createAudioBuffers); - - var js_inputs = faust_module.wasm_dsp_factory.createAudioBuffers(instance_ptr1.getNumInputs(), 256); - var js_outputs = faust_module.wasm_dsp_factory.createAudioBuffers(instance_ptr1.getNumOutputs(), 256); - - //console.log("instance_ptr1.compute " + instance_ptr1.compute); - - instance_ptr1.compute(256, js_inputs, js_outputs); - - faust_module.wasm_dsp_factory.deleteAudioBuffers(js_inputs, instance_ptr1.getNumInputs()); - faust_module.wasm_dsp_factory.deleteAudioBuffers(js_outputs, instance_ptr1.getNumOutputs()); - - //instance_ptr1.computeJSTest(128); - }); - - //=========================== - // End API test - //=========================== - var helpers_code_ptr = faust.getWasmCHelpers(module_code_ptr); var helpers_code = faust_module.UTF8ToString(helpers_code_ptr);