diff --git a/packages/BigMuff/descriptor.json b/packages/BigMuff/descriptor.json index 1779084..9f0d4b4 100644 --- a/packages/BigMuff/descriptor.json +++ b/packages/BigMuff/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 86b6f2e..2c81ca2 100644 --- a/packages/GuitarAmpSim60s/descriptor.json +++ b/packages/GuitarAmpSim60s/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 8d30e7e..9bd7223 100644 --- a/packages/StonePhaserStereo/descriptor.json +++ b/packages/StonePhaserStereo/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index f0bfe19..76b334c 100644 --- a/packages/TS9_OverdriveFaustGenerated/descriptor.json +++ b/packages/TS9_OverdriveFaustGenerated/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 57c43ce..91a3ad5 100644 --- a/packages/VirtualMidiKeyboardNoSound/src/descriptor.json +++ b/packages/VirtualMidiKeyboardNoSound/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 31b1dbc..7bc60bf 100644 --- a/packages/WamExample/src/descriptor.json +++ b/packages/WamExample/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 0813263..3c008b4 100644 --- a/packages/WamExampleTemplate/src/descriptor.json +++ b/packages/WamExampleTemplate/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 380aab5..5276f65 100644 --- a/packages/csoundPitchShifter/src/descriptor.json +++ b/packages/csoundPitchShifter/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 138af6e..fedfcd3 100644 --- a/packages/disto_machine/src/descriptor.json +++ b/packages/disto_machine/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index ce684cb..ec85246 100644 --- a/packages/faustFlute/descriptor.json +++ b/packages/faustFlute/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 3d1d00d..d2853fd 100644 --- a/packages/faustPingPongDelay/plugin/descriptor.json +++ b/packages/faustPingPongDelay/plugin/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 6f44977..17f908d 100644 --- a/packages/faustPingPongDelayDefaultUI/descriptor.json +++ b/packages/faustPingPongDelayDefaultUI/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index b89606c..960dab7 100644 --- a/packages/graphicEqualizer/descriptor.json +++ b/packages/graphicEqualizer/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 28003be..094ae4d 100644 --- a/packages/livegain/src/livegain/descriptor.json +++ b/packages/livegain/src/livegain/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 127d656..d33468d 100644 --- a/packages/livegain/src/oscilloscope/descriptor.json +++ b/packages/livegain/src/oscilloscope/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 1c15088..7a540df 100644 --- a/packages/livegain/src/spectrogram/descriptor.json +++ b/packages/livegain/src/spectrogram/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index aa09e22..a7ecfe9 100644 --- a/packages/livegain/src/spectroscope/descriptor.json +++ b/packages/livegain/src/spectroscope/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index eabcaf8..c4bc8ae 100644 --- a/packages/midiOutput/src/descriptor.json +++ b/packages/midiOutput/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 9c633d5..432658c 100644 --- a/packages/midiSequencer/src/descriptor.json +++ b/packages/midiSequencer/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 72f41f0..7c40c93 100644 --- a/packages/obxd/descriptor.json +++ b/packages/obxd/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< HEAD "identifier": "com.webaudiomodules.wam-examples.obxd", -======= - "identifier": "org.webaudiomodules.wam-examples.obxd", ->>>>>>> master "name": "OBXD", "vendor": "Jari Kleimola 2017-2020 (jari@webaudiomodules.org)", "description": "", diff --git a/packages/pedalboard/src/descriptor.json b/packages/pedalboard/src/descriptor.json index 47399a9..e3e47ad 100644 --- a/packages/pedalboard/src/descriptor.json +++ b/packages/pedalboard/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 16a83f8..48764eb 100644 --- a/packages/pingpongdelay/src/descriptor.json +++ b/packages/pingpongdelay/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 8f67942..5d501b7 100644 --- a/packages/quadrafuzz/src/descriptor.json +++ b/packages/quadrafuzz/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 3343729..95c5cca 100644 --- a/packages/quadrafuzz_without_builder/src/descriptor.json +++ b/packages/quadrafuzz_without_builder/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 702433a..9a25f25 100644 --- a/packages/randomnote/descriptor.json +++ b/packages/randomnote/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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/sdk b/packages/sdk index 56d68a2..d425ee7 160000 --- a/packages/sdk +++ b/packages/sdk @@ -1 +1 @@ -Subproject commit 56d68a267237d2731bf8882c5fc6d74f9f516660 +Subproject commit d425ee7ec0479b2a2ee0940374242356997b8ba6 diff --git a/packages/simpleMidiKeyboard/descriptor.json b/packages/simpleMidiKeyboard/descriptor.json index 346a5c1..4a4468b 100644 --- a/packages/simpleMidiKeyboard/descriptor.json +++ b/packages/simpleMidiKeyboard/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 7a5224b..de4d6a2 100644 --- a/packages/simpleTransport/src/descriptor.json +++ b/packages/simpleTransport/src/descriptor.json @@ -1,11 +1,6 @@ { -<<<<<<< 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 index f253a3b..084a46e 100644 --- a/packages/synth101/src/descriptor.json +++ b/packages/synth101/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 8923798..71a6072 100644 --- a/packages/template_midi_parammgr/src/descriptor.json +++ b/packages/template_midi_parammgr/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 924b521..404295b 100644 --- a/packages/template_parammgr/src/descriptor.json +++ b/packages/template_parammgr/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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/descriptor.json b/packages/tinySynth/src/descriptor.json index bd5fe23..50f739e 100644 --- a/packages/tinySynth/src/descriptor.json +++ b/packages/tinySynth/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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 index 4efe5cd..826052c 100644 --- a/packages/wamEventViewer/src/descriptor.json +++ b/packages/wamEventViewer/src/descriptor.json @@ -1,9 +1,5 @@ { -<<<<<<< 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",