Merge branch 'master' into fix-chromium-aw-audioparam

webaudiomodules · Oct 17, 2024 · d3beca6 · d3beca6
2 parents 294d520 + 9edf0c4
commit d3beca6
Show file tree

Hide file tree

Showing 33 changed files with 131 additions and 1 deletion.
diff --git a/packages/BigMuff/descriptor.json b/packages/BigMuff/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.faust-bigmuff",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.bigmuff",
+>>>>>>> master
     "name": "Faust BigMuff",
     "vendor": "Michel Buffa",
     "description": "",

diff --git a/packages/GuitarAmpSim60s/descriptor.json b/packages/GuitarAmpSim60s/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
   "identifier": "com.webaudiomodules.wam-examples.guitarampsim60s",
+=======
+  "identifier": "org.webaudiomodules.wam-examples.guitarampsim60s",
+>>>>>>> master
   "name": "GuitarAmpSim60s",
   "vendor": "Michel Buffa",
   "description": "TODO",

diff --git a/packages/StonePhaserStereo/descriptor.json b/packages/StonePhaserStereo/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.stonephaser",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.stonephaser",
+>>>>>>> master
     "name": "StonePhaser",
     "vendor": "WebAudioModule",
     "description": "StonePhaser Stereo written in Faust",

diff --git a/packages/TS9_OverdriveFaustGenerated/descriptor.json b/packages/TS9_OverdriveFaustGenerated/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.ts9overdrive",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.ts9overdrive",
+>>>>>>> master
     "name": "TS9 Overdrive",
     "vendor": "WebAudioModule",
     "description": "Overdrive written in Faust",

diff --git a/packages/VirtualMidiKeyboardNoSound/src/descriptor.json b/packages/VirtualMidiKeyboardNoSound/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.virtual-midi-keyboard",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.virtualmidikeyboard",
+>>>>>>> master
     "name": "VirtualMidiKeyboardNoSound",
     "vendor": "WebAudioModule",
     "description": "Midi Virtual keyboard",

diff --git a/packages/WamExample/src/descriptor.json b/packages/WamExample/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.wam-example",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.example",
+>>>>>>> master
     "name": "WamExample",
     "vendor": "WebAudioModule",
     "description": "Simple example using WebAudioModule, WamNode, and WamProcessor classes.",

diff --git a/packages/WamExampleTemplate/src/descriptor.json b/packages/WamExampleTemplate/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.template",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.exampletemplate",
+>>>>>>> master
     "name": "WamExampleTemplate",
     "vendor": "WebAudioModule",
     "description": "Simple example template for WebAudioModule, WamNode, and WamProcessor classes.",

diff --git a/packages/csoundPitchShifter/src/descriptor.json b/packages/csoundPitchShifter/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.csound-pitchshifter",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.csoundpitchshifter",
+>>>>>>> master
     "name": "Csound PitchShifter",
     "vendor": "Steven Yi",
     "description": "",

diff --git a/packages/disto_machine/src/descriptor.json b/packages/disto_machine/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.distomachine-nobuilder",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.distomachine",
+>>>>>>> master
     "name": "DistoMachine (No builder)",
     "vendor": "WebAudioModule",
     "description": "DistoMachine written in native WebAudio nodes",

diff --git a/packages/faustFlute/descriptor.json b/packages/faustFlute/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.faust-flute",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.faustflute",
+>>>>>>> master
     "name": "Faust Flute MIDI",
     "vendor": "Grame",
     "description": "Faust MIDI Instrument",

diff --git a/packages/faustPingPongDelay/plugin/descriptor.json b/packages/faustPingPongDelay/plugin/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.faust-pingpongdelay",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.faustpingpongdelay",
+>>>>>>> master
     "name": "Faust PingPongDelay",
     "vendor": "Shihong Ren",
     "description": "A PingPongDelay written in Faust with its default UI",

diff --git a/packages/faustPingPongDelayDefaultUI/descriptor.json b/packages/faustPingPongDelayDefaultUI/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.faust-pingpongdelay-default-ui",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.faustpingpongdelay_default_ui",
+>>>>>>> master
     "name": "Faust PingPongDelay (DefaultUI)",
     "vendor": "Shihong Ren",
     "description": "A PingPongDelay written in Faust with its default UI",

diff --git a/packages/graphicEqualizer/descriptor.json b/packages/graphicEqualizer/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
   "identifier": "com.webaudiomodules.wam-examples.graphic-equalizer",
+=======
+  "identifier": "org.webaudiomodules.wam-examples.equalizer",
+>>>>>>> master
   "name": "Equalizer",
   "vendor": "Wasabi",
   "description": "TODO",

diff --git a/packages/livegain/src/livegain/descriptor.json b/packages/livegain/src/livegain/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.livegain",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.livegain",
+>>>>>>> master
     "name": "LiveGain",
     "vendor": "Shihong Ren",
     "description": "TypeScript/React LiveGain WebAudioModule",

diff --git a/packages/livegain/src/oscilloscope/descriptor.json b/packages/livegain/src/oscilloscope/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.oscilloscope",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.oscilloscope",
+>>>>>>> master
     "name": "Oscilloscope",
     "vendor": "Shihong Ren",
     "description": "TypeScript/React Oscilloscope WebAudioModule",

diff --git a/packages/livegain/src/spectrogram/descriptor.json b/packages/livegain/src/spectrogram/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.spectrogram",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.spectrogram",
+>>>>>>> master
     "name": "Spectrogram",
     "vendor": "Shihong Ren",
     "description": "TypeScript/React Spectrogram WebAudioModule",

diff --git a/packages/livegain/src/spectroscope/descriptor.json b/packages/livegain/src/spectroscope/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.spectroscope",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.spectroscope",
+>>>>>>> master
     "name": "Spectroscope",
     "vendor": "Shihong Ren",
     "description": "TypeScript/React Spectroscope WebAudioModule",

diff --git a/packages/midiOutput/src/descriptor.json b/packages/midiOutput/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.midi-output",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.midioutput",
+>>>>>>> master
     "name": "MIDI Output",
     "vendor": "WebAudioModule",
     "description": "use WebMIDI API for output",

diff --git a/packages/midiSequencer/src/descriptor.json b/packages/midiSequencer/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.midi-sequencer",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.midisequencer",
+>>>>>>> master
     "name": "MIDI Sequencer",
     "vendor": "WebAudioModule",
     "description": "MIDI Sequencer (WAM events)",

diff --git a/packages/obxd/descriptor.json b/packages/obxd/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.obxd",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.obxd",
+>>>>>>> master
     "name": "OBXD",
     "vendor": "Jari Kleimola 2017-2020 ([email protected])",
     "description": "",

diff --git a/packages/pedalboard/src/descriptor.json b/packages/pedalboard/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.pedalboard",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.pedalboard",
+>>>>>>> master
     "name": "Pedalboard",
     "vendor": "WebAudioModule",
     "description": "A rack to load multiple WAMs",

diff --git a/packages/pingpongdelay/src/descriptor.json b/packages/pingpongdelay/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.pingpongdelay",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.pingpongdelay",
+>>>>>>> master
     "name": "PingPongDelay",
     "vendor": "WebAudioModule",
     "description": "A PingPongDelay written in native WebAudio nodes",

diff --git a/packages/quadrafuzz/src/descriptor.json b/packages/quadrafuzz/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.quadrafuzz",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.quadrafuzz",
+>>>>>>> master
     "name": "Quadrafuzz",
     "vendor": "WebAudioModule",
     "description": "Quadrafuzz written in native WebAudio nodes",

diff --git a/packages/quadrafuzz_without_builder/src/descriptor.json b/packages/quadrafuzz_without_builder/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.quadrafuzz-nobuilder",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.quadrafuzz_nobuilder",
+>>>>>>> master
     "name": "Quadrafuzz (No builder)",
     "vendor": "WebAudioModule",
     "description": "Quadrafuzz written in native WebAudio nodes",

diff --git a/packages/randomnote/descriptor.json b/packages/randomnote/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.random-note-gen",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.randomnote",
+>>>>>>> master
     "name": "Random Note Generator",
     "vendor": "WebAudioModule",
     "description": "Generate Random MIDI Notes",

diff --git a/packages/simpleMidiKeyboard/descriptor.json b/packages/simpleMidiKeyboard/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.midi-keyboard",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.simplemidikeyboard",
+>>>>>>> master
     "name": "Virtual MIDI Keyboard",
     "vendor": "WebAudioModule",
     "description": "UI to Generate MIDI Notes",

diff --git a/packages/simpleTransport/src/descriptor.json b/packages/simpleTransport/src/descriptor.json
@@ -1,6 +1,11 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.simple-transport",
     "name": "Simple Transport",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.simpletransport",
+    "name": "Simple Tranport",
+>>>>>>> master
     "vendor": "WebAudioModule",
     "description": "wam-transport event generator",
     "version": "1.0.0",

diff --git a/packages/synth101/src/descriptor.json b/packages/synth101/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.synth101",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.synth101",
+>>>>>>> master
     "name": "Synth-101",
     "vendor": "Tom",
     "description": "Synth-101 WAM2 MIDI Instrument",

diff --git a/packages/template_midi_parammgr/src/descriptor.json b/packages/template_midi_parammgr/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.template-midi-wam-parammgr-js",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.template_midi_parammgr",
+>>>>>>> master
     "name": "TemplateMidiWamPMJS",
     "vendor": "WebAudioModule",
     "description": "Template MIDI WAM: ParamMgr + JS - build",

diff --git a/packages/template_parammgr/src/descriptor.json b/packages/template_parammgr/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.template-wam-parammgr-js",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.template_parammgr",
+>>>>>>> master
     "name": "TemplateWamPMJS",
     "vendor": "WebAudioModule",
     "description": "Template WAM: ParamMgr + JS - build",

diff --git a/packages/tinySynth/src/Node.js b/packages/tinySynth/src/Node.js
@@ -21,7 +21,7 @@ export default class TinySynthNode extends CompositeAudioNode {
 		this._wamNode = wamNode;
 		this.connectNodes();
 		this._wamNode.addEventListener('wam-midi', ({ detail }) => {
-			console.log(detail);
+			// console.log(detail);
 			const msg = detail.data.bytes;
 			this.synth.send(msg);
 		});
@@ -36,6 +36,7 @@ export default class TinySynthNode extends CompositeAudioNode {
 
 	async createSynth() {
 		this.synth = new WebAudioTinySynth();
+		this.synth.setAudioContext(this.context, this.outputNode);
 
 		await this.synth.ready();
 		console.log("TinySynth default sound : " + this.synth.getTimbreName(0, 0));

diff --git a/packages/tinySynth/src/descriptor.json b/packages/tinySynth/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.tinysynth",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.tinysynth",
+>>>>>>> master
     "name": "TinySynth (no GUI)",
     "vendor": "WebAudioModule",
     "description": "TinySynth GM synthesizer without GUI",

diff --git a/packages/wamEventViewer/src/descriptor.json b/packages/wamEventViewer/src/descriptor.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< HEAD
     "identifier": "com.webaudiomodules.wam-examples.wam-event-viewer",
+=======
+    "identifier": "org.webaudiomodules.wam-examples.wan_event_viewer",
+>>>>>>> master
     "name": "WAM Event Viewer",
     "vendor": "WebAudioModule",
     "description": "Display received events",