From 0c3cfba9a240651df4c9a2395bc95a295c5e8dc9 Mon Sep 17 00:00:00 2001 From: shren Date: Thu, 22 Feb 2024 22:17:49 +0800 Subject: [PATCH 1/5] update sdk-parammgr for chromium bug --- packages/faustPingPongDelayDefaultUI/gui.js | 2 +- packages/sdk-parammgr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/faustPingPongDelayDefaultUI/gui.js b/packages/faustPingPongDelayDefaultUI/gui.js index e41f3a3..906edef 100644 --- a/packages/faustPingPongDelayDefaultUI/gui.js +++ b/packages/faustPingPongDelayDefaultUI/gui.js @@ -33,7 +33,7 @@ class FaustDefaultGui extends HTMLElement { listenWindowResize: false, }); this.faustUI.paramChangeByUI = (path, value) => { - wamNode.setParamValue(path, value); + wamNode.setParameterValues({ [path]: { value } }); }; faustNode.output_handler = (path, value) => this.faustUI.paramChangeByDSP(path, value); $container.style.width = `${this.faustUI.minWidth}px`; diff --git a/packages/sdk-parammgr b/packages/sdk-parammgr index 3070a5b..7ac79d5 160000 --- a/packages/sdk-parammgr +++ b/packages/sdk-parammgr @@ -1 +1 @@ -Subproject commit 3070a5b55ea757a4cb0981def8241bae71ecb89c +Subproject commit 7ac79d502cdd73209c1fab1ba194fd0f1a175c05 From c2853207c75c6857960d94a39c5a41f21f4b1de8 Mon Sep 17 00:00:00 2001 From: shren Date: Thu, 22 Feb 2024 22:27:48 +0800 Subject: [PATCH 2/5] rebuild --- packages/api | 2 +- packages/sdk | 2 +- yarn.lock | 243 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 245 insertions(+), 2 deletions(-) diff --git a/packages/api b/packages/api index ac67b75..ea39fcc 160000 --- a/packages/api +++ b/packages/api @@ -1 +1 @@ -Subproject commit ac67b75b5849e3374ee7465d30a34dc89b79d73e +Subproject commit ea39fccecc57db352980ac36bcd7ea8ae4de25e0 diff --git a/packages/sdk b/packages/sdk index 6234b87..56d68a2 160000 --- a/packages/sdk +++ b/packages/sdk @@ -1 +1 @@ -Subproject commit 6234b8797e73fd0a7f812f51a87d23aa9d306f8e +Subproject commit 56d68a267237d2731bf8882c5fc6d74f9f516660 diff --git a/yarn.lock b/yarn.lock index e8dcc6f..0491692 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1011,6 +1011,121 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f" integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA== +"@esbuild/aix-ppc64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz#eafa8775019b3650a77e8310ba4dbd17ca7af6d5" + integrity sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA== + +"@esbuild/android-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz#68791afa389550736f682c15b963a4f37ec2f5f6" + integrity sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A== + +"@esbuild/android-arm@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.20.1.tgz#38c91d8ee8d5196f7fbbdf4f0061415dde3a473a" + integrity sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw== + +"@esbuild/android-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.20.1.tgz#93f6190ce997b313669c20edbf3645fc6c8d8f22" + integrity sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA== + +"@esbuild/darwin-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz#0d391f2e81fda833fe609182cc2fbb65e03a3c46" + integrity sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA== + +"@esbuild/darwin-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz#92504077424584684862f483a2242cfde4055ba2" + integrity sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA== + +"@esbuild/freebsd-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz#a1646fa6ba87029c67ac8a102bb34384b9290774" + integrity sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw== + +"@esbuild/freebsd-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz#41c9243ab2b3254ea7fb512f71ffdb341562e951" + integrity sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg== + +"@esbuild/linux-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz#f3c1e1269fbc9eedd9591a5bdd32bf707a883156" + integrity sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w== + +"@esbuild/linux-arm@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz#4503ca7001a8ee99589c072801ce9d7540717a21" + integrity sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw== + +"@esbuild/linux-ia32@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz#98c474e3e0cbb5bcbdd8561a6e65d18f5767ce48" + integrity sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw== + +"@esbuild/linux-loong64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz#a8097d28d14b9165c725fe58fc438f80decd2f33" + integrity sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA== + +"@esbuild/linux-mips64el@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz#c44f6f0d7d017c41ad3bb15bfdb69b690656b5ea" + integrity sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA== + +"@esbuild/linux-ppc64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz#0765a55389a99237b3c84227948c6e47eba96f0d" + integrity sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw== + +"@esbuild/linux-riscv64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz#e4153b032288e3095ddf4c8be07893781b309a7e" + integrity sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg== + +"@esbuild/linux-s390x@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz#b9ab8af6e4b73b26d63c1c426d7669a5d53eb5a7" + integrity sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ== + +"@esbuild/linux-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz#0b25da17ac38c3e11cdd06ca3691d4d6bef2755f" + integrity sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA== + +"@esbuild/netbsd-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz#3148e48406cd0d4f7ba1e0bf3f4d77d548c98407" + integrity sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg== + +"@esbuild/openbsd-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz#7b73e852986a9750192626d377ac96ac2b749b76" + integrity sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw== + +"@esbuild/sunos-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz#402a441cdac2eee98d8be378c7bc23e00c1861c5" + integrity sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q== + +"@esbuild/win32-arm64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz#36c4e311085806a6a0c5fc54d1ac4d7b27e94d7b" + integrity sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A== + +"@esbuild/win32-ia32@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz#0cf933be3fb9dc58b45d149559fe03e9e22b54fe" + integrity sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw== + +"@esbuild/win32-x64@0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz#77583b6ea54cee7c1410ebbd54051b6a3fcbd8ba" + integrity sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA== + "@eslint/eslintrc@^0.4.3": version "0.4.3" resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" @@ -2861,6 +2976,11 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-sequence-parser@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ansi-sequence-parser/-/ansi-sequence-parser-1.1.1.tgz#e0aa1cdcbc8f8bb0b5bca625aac41f5f056973cf" + integrity sha512-vJXt3yiaUL4UU546s3rPXlsry/RnM730G1+HkpKE012AN0sx1eOrxSu95oKDIonskeLTijMgqWZ3uDEe3NFvyg== + ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -3289,6 +3409,13 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + braces@^2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" @@ -3699,6 +3826,15 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -4597,6 +4733,14 @@ dts-bundle-generator@^6.2.0: typescript ">=3.0.1" yargs "^17.2.1" +dts-bundle-generator@^9.3.1: + version "9.3.1" + resolved "https://registry.yarnpkg.com/dts-bundle-generator/-/dts-bundle-generator-9.3.1.tgz#dfc2b20b2ceb5afe4b3deed516b997e8782219df" + integrity sha512-1/nMT7LFOkXbrL1ZvLpzrjNbfX090LZ64nLIXVmet557mshFCGP/oTiQiZenafJZ6GsmRQLTYKSlQnkxK8tsTw== + dependencies: + typescript ">=5.0.2" + yargs "^17.6.0" + duplexer@^0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" @@ -4897,6 +5041,35 @@ esbuild@^0.14.2, esbuild@^0.14.6, esbuild@^0.14.7: esbuild-windows-64 "0.14.21" esbuild-windows-arm64 "0.14.21" +esbuild@^0.20.1: + version "0.20.1" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.20.1.tgz#1e4cbb380ad1959db7609cb9573ee77257724a3e" + integrity sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA== + optionalDependencies: + "@esbuild/aix-ppc64" "0.20.1" + "@esbuild/android-arm" "0.20.1" + "@esbuild/android-arm64" "0.20.1" + "@esbuild/android-x64" "0.20.1" + "@esbuild/darwin-arm64" "0.20.1" + "@esbuild/darwin-x64" "0.20.1" + "@esbuild/freebsd-arm64" "0.20.1" + "@esbuild/freebsd-x64" "0.20.1" + "@esbuild/linux-arm" "0.20.1" + "@esbuild/linux-arm64" "0.20.1" + "@esbuild/linux-ia32" "0.20.1" + "@esbuild/linux-loong64" "0.20.1" + "@esbuild/linux-mips64el" "0.20.1" + "@esbuild/linux-ppc64" "0.20.1" + "@esbuild/linux-riscv64" "0.20.1" + "@esbuild/linux-s390x" "0.20.1" + "@esbuild/linux-x64" "0.20.1" + "@esbuild/netbsd-x64" "0.20.1" + "@esbuild/openbsd-x64" "0.20.1" + "@esbuild/sunos-x64" "0.20.1" + "@esbuild/win32-arm64" "0.20.1" + "@esbuild/win32-ia32" "0.20.1" + "@esbuild/win32-x64" "0.20.1" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -7227,6 +7400,11 @@ jsonc-parser@^3.0.0: resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22" integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA== +jsonc-parser@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.1.tgz#031904571ccf929d7670ee8c547545081cb37f1a" + integrity sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA== + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -7719,6 +7897,11 @@ marked@^4.0.10: resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.12.tgz#2262a4e6fd1afd2f13557726238b69a48b982f7d" integrity sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ== +marked@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" + integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" @@ -7899,6 +8082,13 @@ minimatch@^3.0.2, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +minimatch@^9.0.3: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0, minimist-options@^4.0.2: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -10145,6 +10335,16 @@ shiki@^0.10.0: vscode-oniguruma "^1.6.1" vscode-textmate "5.2.0" +shiki@^0.14.7: + version "0.14.7" + resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.14.7.tgz#c3c9e1853e9737845f1d2ef81b31bcfb07056d4e" + integrity sha512-dNPAPrxSc87ua2sKJ3H5dQ/6ZaY8RNnaAqK+t0eG7p0Soi2ydiqbGOTaZCqaYvA/uZYfS1LJnemt3Q+mSfcPCg== + dependencies: + ansi-sequence-parser "^1.1.0" + jsonc-parser "^3.2.0" + vscode-oniguruma "^1.7.0" + vscode-textmate "^8.0.0" + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -11004,11 +11204,26 @@ typedoc@^0.22.10: minimatch "^3.0.4" shiki "^0.10.0" +typedoc@^0.25.8: + version "0.25.8" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.25.8.tgz#7d0e1bf12d23bf1c459fd4893c82cb855911ff12" + integrity sha512-mh8oLW66nwmeB9uTa0Bdcjfis+48bAjSH3uqdzSuSawfduROQLlXw//WSNZLYDdhmMVB7YcYZicq6e8T0d271A== + dependencies: + lunr "^2.3.9" + marked "^4.3.0" + minimatch "^9.0.3" + shiki "^0.14.7" + typescript@>=3.0.1, typescript@^4.3.4, typescript@^4.5.3, typescript@^4.5.4: version "4.5.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA== +typescript@>=5.0.2, typescript@^5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" + integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== + uglify-js@3.4.x: version "3.4.10" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f" @@ -11221,11 +11436,21 @@ vscode-oniguruma@^1.6.1: resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.1.tgz#2bf4dfcfe3dd2e56eb549a3068c8ee39e6c30ce5" integrity sha512-vc4WhSIaVpgJ0jJIejjYxPvURJavX6QG41vu0mGhqywMkQqulezEqEQ3cO3gc8GvcOpX6ycmKGqRoROEMBNXTQ== +vscode-oniguruma@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz#439bfad8fe71abd7798338d1cd3dc53a8beea94b" + integrity sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA== + vscode-textmate@5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e" integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ== +vscode-textmate@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-8.0.0.tgz#2c7a3b1163ef0441097e0b5d6389cd5504b59e5d" + integrity sha512-AFbieoL7a5LMqcnOF04ji+rpXadgOXnZsxQr//r83kLPr7biP7am3g9zbaZIaBGwBRWeSvoMD4mgPdX3e4NWBg== + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -11590,6 +11815,11 @@ yargs-parser@^21.0.0: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" @@ -11616,6 +11846,19 @@ yargs@^17.2.1: y18n "^5.0.5" yargs-parser "^21.0.0" +yargs@^17.6.0: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" From 2a7a75629c315acbef4a3f6be42009c601d7ea8e Mon Sep 17 00:00:00 2001 From: shren Date: Thu, 22 Feb 2024 22:42:09 +0800 Subject: [PATCH 3/5] trying to improve github runs --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d0a7d4..148c37d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: submodules: true - name: Install Dependencies - run: yarn install + run: yarn install || yarn install - name: Initialize dependencies run: yarn lerna bootstrap From 294d520c4e76d28b0883db1771c3da9836761508 Mon Sep 17 00:00:00 2001 From: shren Date: Sat, 24 Feb 2024 17:02:26 +0800 Subject: [PATCH 4/5] adding identifier to descriptor & various fixes --- packages/BigMuff/descriptor.json | 1 + packages/GuitarAmpSim60s/descriptor.json | 19 +++++++++-------- packages/StonePhaserStereo/descriptor.json | 1 + .../descriptor.json | 1 + .../src/descriptor.json | 1 + .../WamExample/src/WamExampleProcessor.js | 2 +- packages/WamExample/src/descriptor.json | 1 + .../src/WamExampleTemplateProcessor.js | 2 +- .../WamExampleTemplate/src/descriptor.json | 1 + .../csoundPitchShifter/src/descriptor.json | 3 ++- packages/disto_machine/src/descriptor.json | 1 + packages/faustFlute/descriptor.json | 1 + .../faustPingPongDelay/plugin/descriptor.json | 1 + .../descriptor.json | 1 + packages/graphicEqualizer/descriptor.json | 21 ++++++++++--------- .../livegain/src/livegain/descriptor.json | 1 + packages/livegain/src/livegain/index.tsx | 16 +++++++++----- .../livegain/src/oscilloscope/descriptor.json | 1 + packages/livegain/src/oscilloscope/index.tsx | 16 +++++++++----- .../livegain/src/spectrogram/descriptor.json | 1 + packages/livegain/src/spectrogram/index.tsx | 16 +++++++++----- .../livegain/src/spectroscope/descriptor.json | 1 + packages/livegain/src/spectroscope/index.tsx | 16 +++++++++----- packages/livegain/webpack.config.js | 11 ++++++++-- packages/midiOutput/src/descriptor.json | 1 + packages/midiOutput/src/index.js | 5 +++++ packages/midiSequencer/src/descriptor.json | 1 + packages/midiSequencer/src/index.ts | 4 ++++ packages/obxd/WasmProcessor.js | 2 +- packages/obxd/descriptor.json | 1 + packages/pedalboard/src/descriptor.json | 1 + packages/pingpongdelay/src/descriptor.json | 1 + packages/quadrafuzz/src/descriptor.json | 1 + .../src/descriptor.json | 1 + packages/randomnote/descriptor.json | 1 + packages/sdk-parammgr | 2 +- packages/simpleMidiKeyboard/descriptor.json | 1 + packages/simpleTransport/src/descriptor.json | 5 +++-- packages/synth101/src/descriptor.json | 1 + .../src/descriptor.json | 1 + .../template_parammgr/src/descriptor.json | 1 + packages/tinySynth/src/descriptor.json | 1 + packages/wamEventViewer/src/descriptor.json | 1 + packages/wamEventViewer/src/index.js | 5 +++++ 44 files changed, 125 insertions(+), 48 deletions(-) diff --git a/packages/BigMuff/descriptor.json b/packages/BigMuff/descriptor.json index 15012e5..9f0d4b4 100644 --- a/packages/BigMuff/descriptor.json +++ b/packages/BigMuff/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.faust-bigmuff", "name": "Faust BigMuff", "vendor": "Michel Buffa", "description": "", diff --git a/packages/GuitarAmpSim60s/descriptor.json b/packages/GuitarAmpSim60s/descriptor.json index 70efedf..2c81ca2 100644 --- a/packages/GuitarAmpSim60s/descriptor.json +++ b/packages/GuitarAmpSim60s/descriptor.json @@ -1,10 +1,11 @@ { - "name": "GuitarAmpSim60s", - "vendor": "Michel Buffa", - "description": "TODO", - "version": "1.0.0", - "apiVersion": "2.0.0", - "keywords": ["faust"], - "isInstrument": false, - "website": "" - } \ No newline at end of file + "identifier": "com.webaudiomodules.wam-examples.guitarampsim60s", + "name": "GuitarAmpSim60s", + "vendor": "Michel Buffa", + "description": "TODO", + "version": "1.0.0", + "apiVersion": "2.0.0", + "keywords": ["faust"], + "isInstrument": false, + "website": "" +} \ No newline at end of file diff --git a/packages/StonePhaserStereo/descriptor.json b/packages/StonePhaserStereo/descriptor.json index 6f10cd7..9bd7223 100644 --- a/packages/StonePhaserStereo/descriptor.json +++ b/packages/StonePhaserStereo/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.stonephaser", "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 a35043c..76b334c 100644 --- a/packages/TS9_OverdriveFaustGenerated/descriptor.json +++ b/packages/TS9_OverdriveFaustGenerated/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.ts9overdrive", "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 8d6e6a5..91a3ad5 100644 --- a/packages/VirtualMidiKeyboardNoSound/src/descriptor.json +++ b/packages/VirtualMidiKeyboardNoSound/src/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.virtual-midi-keyboard", "name": "VirtualMidiKeyboardNoSound", "vendor": "WebAudioModule", "description": "Midi Virtual keyboard", diff --git a/packages/WamExample/src/WamExampleProcessor.js b/packages/WamExample/src/WamExampleProcessor.js index 8637000..3d372d9 100644 --- a/packages/WamExample/src/WamExampleProcessor.js +++ b/packages/WamExample/src/WamExampleProcessor.js @@ -287,7 +287,7 @@ const getWamExampleProcessor = (moduleId) => { } } try { - registerProcessor('WebAudioModuleWamExample', WamExampleProcessor); + registerProcessor(moduleId, WamExampleProcessor); } catch (error) { console.warn(error); } diff --git a/packages/WamExample/src/descriptor.json b/packages/WamExample/src/descriptor.json index e83a5fe..7bc60bf 100644 --- a/packages/WamExample/src/descriptor.json +++ b/packages/WamExample/src/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.wam-example", "name": "WamExample", "vendor": "WebAudioModule", "description": "Simple example using WebAudioModule, WamNode, and WamProcessor classes.", diff --git a/packages/WamExampleTemplate/src/WamExampleTemplateProcessor.js b/packages/WamExampleTemplate/src/WamExampleTemplateProcessor.js index 942e2d4..61c829b 100644 --- a/packages/WamExampleTemplate/src/WamExampleTemplateProcessor.js +++ b/packages/WamExampleTemplate/src/WamExampleTemplateProcessor.js @@ -163,7 +163,7 @@ } } try { - registerProcessor('WebAudioModuleWamExampleTemplate', WamExampleTemplateProcessor); + registerProcessor(moduleId, WamExampleTemplateProcessor); } catch (error) { console.warn(error); } diff --git a/packages/WamExampleTemplate/src/descriptor.json b/packages/WamExampleTemplate/src/descriptor.json index b590f62..3c008b4 100644 --- a/packages/WamExampleTemplate/src/descriptor.json +++ b/packages/WamExampleTemplate/src/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.template", "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 367a9f4..5276f65 100644 --- a/packages/csoundPitchShifter/src/descriptor.json +++ b/packages/csoundPitchShifter/src/descriptor.json @@ -1,11 +1,12 @@ { + "identifier": "com.webaudiomodules.wam-examples.csound-pitchshifter", "name": "Csound PitchShifter", "vendor": "Steven Yi", "description": "", "version": "1.0.0", "apiVersion": "2.0.0", "thumbnail": "screenshot.png", - "keywords": ["faust"], + "keywords": ["csound"], "isInstrument": false, "website": "" } diff --git a/packages/disto_machine/src/descriptor.json b/packages/disto_machine/src/descriptor.json index 19c917a..fedfcd3 100644 --- a/packages/disto_machine/src/descriptor.json +++ b/packages/disto_machine/src/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.distomachine-nobuilder", "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 ea0761d..ec85246 100644 --- a/packages/faustFlute/descriptor.json +++ b/packages/faustFlute/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.faust-flute", "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 cdcecc2..d2853fd 100644 --- a/packages/faustPingPongDelay/plugin/descriptor.json +++ b/packages/faustPingPongDelay/plugin/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.faust-pingpongdelay", "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 54c8af6..17f908d 100644 --- a/packages/faustPingPongDelayDefaultUI/descriptor.json +++ b/packages/faustPingPongDelayDefaultUI/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.faust-pingpongdelay-default-ui", "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 87dd4ef..960dab7 100644 --- a/packages/graphicEqualizer/descriptor.json +++ b/packages/graphicEqualizer/descriptor.json @@ -1,11 +1,12 @@ { - "name": "Equalizer", - "vendor": "Wasabi", - "description": "TODO", - "version": "1.0.0", - "apiVersion": "2.0.0", - "thumbnail": "assets/equal.png", - "keywords": ["equalizer", "mixing"], - "isInstrument": false, - "website": "" - } \ No newline at end of file + "identifier": "com.webaudiomodules.wam-examples.graphic-equalizer", + "name": "Equalizer", + "vendor": "Wasabi", + "description": "TODO", + "version": "1.0.0", + "apiVersion": "2.0.0", + "thumbnail": "assets/equal.png", + "keywords": ["equalizer", "mixing"], + "isInstrument": false, + "website": "" +} \ No newline at end of file diff --git a/packages/livegain/src/livegain/descriptor.json b/packages/livegain/src/livegain/descriptor.json index b7b8f87..094ae4d 100644 --- a/packages/livegain/src/livegain/descriptor.json +++ b/packages/livegain/src/livegain/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.livegain", "name": "LiveGain", "vendor": "Shihong Ren", "description": "TypeScript/React LiveGain WebAudioModule", diff --git a/packages/livegain/src/livegain/index.tsx b/packages/livegain/src/livegain/index.tsx index bad4dfa..954a45e 100644 --- a/packages/livegain/src/livegain/index.tsx +++ b/packages/livegain/src/livegain/index.tsx @@ -5,13 +5,19 @@ import { createElement, destroyElement } from "../gui"; import Node from "./LiveGainNode"; import UI from "./LiveGainUI"; +const getBaseUrl = (relativeUrl: URL) => { + const baseUrl = relativeUrl.href.substring(0, relativeUrl.href.lastIndexOf("/")); + return baseUrl; +}; + export type Parameters = "gain" | "frameRate" | "speedLim" | "min" | "max" | "step" | "orientation" | "metering"; export class LiveGainModule extends WebAudioModule { - static descriptor = { - name: "LiveGain", - vendor: "WebAudioModule" - }; - + _baseUrl = getBaseUrl(new URL(".", import.meta.url)); + _descriptorUrl = `${this._baseUrl}/descriptor.json`; + async initialize(state?: any) { + await this._loadDescriptor(); + return super.initialize(state); + } async createAudioNode(initialState?: any) { const node = new Node(this.audioContext); const inputGainNode = this.audioContext.createGain(); diff --git a/packages/livegain/src/oscilloscope/descriptor.json b/packages/livegain/src/oscilloscope/descriptor.json index 0a2591d..d33468d 100644 --- a/packages/livegain/src/oscilloscope/descriptor.json +++ b/packages/livegain/src/oscilloscope/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.oscilloscope", "name": "Oscilloscope", "vendor": "Shihong Ren", "description": "TypeScript/React Oscilloscope WebAudioModule", diff --git a/packages/livegain/src/oscilloscope/index.tsx b/packages/livegain/src/oscilloscope/index.tsx index b8104d3..0c35141 100644 --- a/packages/livegain/src/oscilloscope/index.tsx +++ b/packages/livegain/src/oscilloscope/index.tsx @@ -5,13 +5,19 @@ import SpectralAnalyserNode from "../worklets/SpectralAnalyser"; import { createElement, destroyElement } from "../gui"; import UI from "./OscilloscopeUI"; +const getBaseUrl = (relativeUrl: URL) => { + const baseUrl = relativeUrl.href.substring(0, relativeUrl.href.lastIndexOf("/")); + return baseUrl; +}; + export type Parameters = "frameRate" | "windowSize" | "interleaved" | "showStats"; export class OscilloscopeModule extends WebAudioModule { - static descriptor = { - name: "Oscilloscope", - vendor: "WebAudioModule" - }; - + _baseUrl = getBaseUrl(new URL(".", import.meta.url)); + _descriptorUrl = `${this._baseUrl}/descriptor.json`; + async initialize(state?: any) { + await this._loadDescriptor(); + return super.initialize(state); + } async createAudioNode(initialState?: any) { const node = new Node(this.audioContext); const outGainNode = this.audioContext.createGain(); diff --git a/packages/livegain/src/spectrogram/descriptor.json b/packages/livegain/src/spectrogram/descriptor.json index db1eb26..7a540df 100644 --- a/packages/livegain/src/spectrogram/descriptor.json +++ b/packages/livegain/src/spectrogram/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.spectrogram", "name": "Spectrogram", "vendor": "Shihong Ren", "description": "TypeScript/React Spectrogram WebAudioModule", diff --git a/packages/livegain/src/spectrogram/index.tsx b/packages/livegain/src/spectrogram/index.tsx index db52754..645b359 100644 --- a/packages/livegain/src/spectrogram/index.tsx +++ b/packages/livegain/src/spectrogram/index.tsx @@ -5,13 +5,19 @@ import SpectralAnalyserNode from "../worklets/SpectralAnalyser"; import { createElement, destroyElement } from "../gui"; import UI from "./SpectrogramUI"; +const getBaseUrl = (relativeUrl: URL) => { + const baseUrl = relativeUrl.href.substring(0, relativeUrl.href.lastIndexOf("/")); + return baseUrl; +}; + export type Parameters = "frameRate" | "windowSize" | "fftSize" | "fftOverlap" | "windowFunction"; export class SpectrogramModule extends WebAudioModule { - static descriptor = { - name: "Spectrogram", - vendor: "WebAudioModule" - }; - + _baseUrl = getBaseUrl(new URL(".", import.meta.url)); + _descriptorUrl = `${this._baseUrl}/descriptor.json`; + async initialize(state?: any) { + await this._loadDescriptor(); + return super.initialize(state); + } async createAudioNode(initialState?: any) { const node = new Node(this.audioContext); const outGainNode = this.audioContext.createGain(); diff --git a/packages/livegain/src/spectroscope/descriptor.json b/packages/livegain/src/spectroscope/descriptor.json index df9d1e8..a7ecfe9 100644 --- a/packages/livegain/src/spectroscope/descriptor.json +++ b/packages/livegain/src/spectroscope/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.spectroscope", "name": "Spectroscope", "vendor": "Shihong Ren", "description": "TypeScript/React Spectroscope WebAudioModule", diff --git a/packages/livegain/src/spectroscope/index.tsx b/packages/livegain/src/spectroscope/index.tsx index a7e9a84..852b855 100644 --- a/packages/livegain/src/spectroscope/index.tsx +++ b/packages/livegain/src/spectroscope/index.tsx @@ -5,13 +5,19 @@ import SpectralAnalyserNode from "../worklets/SpectralAnalyser"; import { createElement, destroyElement } from "../gui"; import UI from "./SpectroscopeUI"; +const getBaseUrl = (relativeUrl: URL) => { + const baseUrl = relativeUrl.href.substring(0, relativeUrl.href.lastIndexOf("/")); + return baseUrl; +}; + export type Parameters = "frameRate" | "windowSize" | "fftSize" | "fftOverlap" | "windowFunction"; export class SpectroscopeModule extends WebAudioModule { - static descriptor = { - name: "Spectroscope", - vendor: "WebAudioModule" - }; - + _baseUrl = getBaseUrl(new URL(".", import.meta.url)); + _descriptorUrl = `${this._baseUrl}/descriptor.json`; + async initialize(state?: any) { + await this._loadDescriptor(); + return super.initialize(state); + } async createAudioNode(initialState?: any) { const node = new Node(this.audioContext); const outGainNode = this.audioContext.createGain(); diff --git a/packages/livegain/webpack.config.js b/packages/livegain/webpack.config.js index c46be72..ceb89ca 100644 --- a/packages/livegain/webpack.config.js +++ b/packages/livegain/webpack.config.js @@ -32,9 +32,16 @@ module.exports = (env, argv) => { path: path.resolve(__dirname, 'dist'), // library: 'JSPatcher', libraryTarget: 'module', - // chunkFilename: 'js/[chunkhash].js' + // chunkFilename: 'js/[chunkhash].js', + publicPath: "auto" }, module: { + parser: { + javascript: { + importMeta: false, + url: false + } + }, rules: [{ test: /\.worklet\.(ts|js)$/, use: [{ @@ -50,7 +57,7 @@ module.exports = (env, argv) => { loader: 'esbuild-loader', options: { loader: 'tsx', - target: 'es2017' + target: 'es2020' } }, exclude: /node_modules/ diff --git a/packages/midiOutput/src/descriptor.json b/packages/midiOutput/src/descriptor.json index ec6cee0..c4bc8ae 100644 --- a/packages/midiOutput/src/descriptor.json +++ b/packages/midiOutput/src/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.midi-output", "name": "MIDI Output", "vendor": "WebAudioModule", "description": "use WebMIDI API for output", diff --git a/packages/midiOutput/src/index.js b/packages/midiOutput/src/index.js index 60fc3ff..4405b08 100644 --- a/packages/midiOutput/src/index.js +++ b/packages/midiOutput/src/index.js @@ -19,6 +19,11 @@ class MidiOutput extends WebAudioModule { _baseUrl = getBaseUrl(new URL('.', import.meta.url)); _descriptorUrl = `${this._baseUrl}/descriptor.json`; + async initialize(state) { + await this._loadDescriptor(); + return super.initialize(state); + } + /** * @param {any} initialState */ diff --git a/packages/midiSequencer/src/descriptor.json b/packages/midiSequencer/src/descriptor.json index f3a0151..432658c 100644 --- a/packages/midiSequencer/src/descriptor.json +++ b/packages/midiSequencer/src/descriptor.json @@ -1,4 +1,5 @@ { + "identifier": "com.webaudiomodules.wam-examples.midi-sequencer", "name": "MIDI Sequencer", "vendor": "WebAudioModule", "description": "MIDI Sequencer (WAM events)", diff --git a/packages/midiSequencer/src/index.ts b/packages/midiSequencer/src/index.ts index 17d9962..ffe1247 100644 --- a/packages/midiSequencer/src/index.ts +++ b/packages/midiSequencer/src/index.ts @@ -10,6 +10,10 @@ const getBaseUrl = (relativeUrl: URL) => { class MidiSequencer extends WebAudioModule { _baseUrl = getBaseUrl(new URL(".", import.meta.url)); _descriptorUrl = `${this._baseUrl}/descriptor.json`; + async initialize(state?: any) { + await this._loadDescriptor(); + return super.initialize(state); + } async createAudioNode(initialState: any) { await MidiSequencerNode.addModules(this.audioContext, this.moduleId); const node: MidiSequencerNode = new MidiSequencerNode(this, {}); diff --git a/packages/obxd/WasmProcessor.js b/packages/obxd/WasmProcessor.js index b8937e3..05f9243 100644 --- a/packages/obxd/WasmProcessor.js +++ b/packages/obxd/WasmProcessor.js @@ -70,7 +70,7 @@ for (var c=0; c Date: Thu, 17 Oct 2024 21:01:50 +0800 Subject: [PATCH 5/5] merge --- packages/BigMuff/descriptor.json | 4 ---- packages/GuitarAmpSim60s/descriptor.json | 4 ---- packages/StonePhaserStereo/descriptor.json | 4 ---- packages/TS9_OverdriveFaustGenerated/descriptor.json | 4 ---- packages/VirtualMidiKeyboardNoSound/src/descriptor.json | 4 ---- packages/WamExample/src/descriptor.json | 4 ---- packages/WamExampleTemplate/src/descriptor.json | 4 ---- packages/csoundPitchShifter/src/descriptor.json | 4 ---- packages/disto_machine/src/descriptor.json | 4 ---- packages/faustFlute/descriptor.json | 4 ---- packages/faustPingPongDelay/plugin/descriptor.json | 4 ---- packages/faustPingPongDelayDefaultUI/descriptor.json | 4 ---- packages/graphicEqualizer/descriptor.json | 4 ---- packages/livegain/src/livegain/descriptor.json | 4 ---- packages/livegain/src/oscilloscope/descriptor.json | 4 ---- packages/livegain/src/spectrogram/descriptor.json | 4 ---- packages/livegain/src/spectroscope/descriptor.json | 4 ---- packages/midiOutput/src/descriptor.json | 4 ---- packages/midiSequencer/src/descriptor.json | 4 ---- packages/obxd/descriptor.json | 4 ---- packages/pedalboard/src/descriptor.json | 4 ---- packages/pingpongdelay/src/descriptor.json | 4 ---- packages/quadrafuzz/src/descriptor.json | 4 ---- packages/quadrafuzz_without_builder/src/descriptor.json | 4 ---- packages/randomnote/descriptor.json | 4 ---- packages/sdk | 2 +- packages/simpleMidiKeyboard/descriptor.json | 4 ---- packages/simpleTransport/src/descriptor.json | 5 ----- packages/synth101/src/descriptor.json | 4 ---- packages/template_midi_parammgr/src/descriptor.json | 4 ---- packages/template_parammgr/src/descriptor.json | 4 ---- packages/tinySynth/src/descriptor.json | 4 ---- packages/wamEventViewer/src/descriptor.json | 4 ---- 33 files changed, 1 insertion(+), 130 deletions(-) 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",