Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fr0stbyteR
Fr0stbyteR committed Oct 17, 2024
1 parent d3beca6 commit 182ab9f
Show file tree
Hide file tree
Showing 33 changed files with 1 addition and 130 deletions.
4 changes: 0 additions & 4 deletions packages/BigMuff/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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": "",
Expand Down
4 changes: 0 additions & 4 deletions packages/GuitarAmpSim60s/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/StonePhaserStereo/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/TS9_OverdriveFaustGenerated/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/VirtualMidiKeyboardNoSound/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/WamExample/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
4 changes: 0 additions & 4 deletions packages/WamExampleTemplate/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
4 changes: 0 additions & 4 deletions packages/csoundPitchShifter/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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": "",
Expand Down
4 changes: 0 additions & 4 deletions packages/disto_machine/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/faustFlute/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/faustPingPongDelay/plugin/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/faustPingPongDelayDefaultUI/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/graphicEqualizer/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/livegain/src/livegain/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/livegain/src/oscilloscope/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/livegain/src/spectrogram/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/livegain/src/spectroscope/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/midiOutput/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/midiSequencer/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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)",
Expand Down
4 changes: 0 additions & 4 deletions packages/obxd/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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 ([email protected])",
"description": "",
Expand Down
4 changes: 0 additions & 4 deletions packages/pedalboard/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/pingpongdelay/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/quadrafuzz/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/quadrafuzz_without_builder/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/randomnote/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk
Submodule sdk updated 5 files
+7 −0 dist/index.js
+2 −2 dist/index.js.map
+2 −2 package-lock.json
+1 −1 package.json
+10 −1 src/WamProcessor.js
4 changes: 0 additions & 4 deletions packages/simpleMidiKeyboard/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
5 changes: 0 additions & 5 deletions packages/simpleTransport/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/synth101/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/template_midi_parammgr/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/template_parammgr/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/tinySynth/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 0 additions & 4 deletions packages/wamEventViewer/src/descriptor.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 182ab9f

Please sign in to comment.