diff --git a/package.json b/package.json index 579fdbb00..542e7b24f 100644 --- a/package.json +++ b/package.json @@ -82,8 +82,8 @@ "@xhayper/discord-rpc": "^1.3.0", "audiomotion-analyzer": "^4.5.1", "axios": "^1.13.2", - "butterchurn": "^2.6.7", - "butterchurn-presets": "^2.4.7", + "butterchurn": "^3.0.0-beta.5", + "butterchurn-presets": "^3.0.0-beta.4", "cheerio": "^1.1.2", "clsx": "^2.1.1", "cmdk": "^1.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a66bffa50..11cc3e3b5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -72,11 +72,11 @@ importers: specifier: ^1.13.2 version: 1.13.2 butterchurn: - specifier: ^2.6.7 - version: 2.6.7 + specifier: ^3.0.0-beta.5 + version: 3.0.0-beta.5 butterchurn-presets: - specifier: ^2.4.7 - version: 2.4.7 + specifier: ^3.0.0-beta.4 + version: 3.0.0-beta.4 cheerio: specifier: ^1.1.2 version: 1.1.2 @@ -361,6 +361,9 @@ packages: peerDependencies: ajv: '>=8' + '@assemblyscript/loader@0.17.14': + resolution: {integrity: sha512-+PVTOfla/0XMLRTQLJFPg4u40XcdTfon6GGea70hBGi8Pd7ZymIXyVUR+vK8wt5Jb4MVKTKPIz43Myyebw5mZA==} + '@atlaskit/pragmatic-drag-and-drop-auto-scroll@2.1.2': resolution: {integrity: sha512-6BgAUxSNbQFiG3uqNxf53cDQADn5mSeh/JsQzCHo46GPQnVWIJk77zWC8yZ++0Mfg1ECy02zNrbniF7SgHAhXQ==} @@ -2272,9 +2275,6 @@ packages: peerDependencies: '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - babel-runtime@6.26.0: - resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==} - balanced-match@1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} @@ -2371,11 +2371,11 @@ packages: builder-util@26.0.11: resolution: {integrity: sha512-xNjXfsldUEe153h1DraD0XvDOpqGR0L5eKFkdReB7eFW5HqysDZFfly4rckda6y9dF39N3pkPlOblcfHKGw+uA==} - butterchurn-presets@2.4.7: - resolution: {integrity: sha512-4MdM8ripz/VfH1BCldrIKdAc/1ryJFBDvqlyow6Ivo1frwj0H3duzvSMFC7/wIjAjxb1QpwVHVqGqS9uAFKhpg==} + butterchurn-presets@3.0.0-beta.4: + resolution: {integrity: sha512-TbQLUPvGOYMZAtWKoCmBtludh9aQZ6NaMGQU4lvPeadBPy3Du3yNmwBjlTMLP5c5mRWElxQPjTL1PtR7FZK3OQ==} - butterchurn@2.6.7: - resolution: {integrity: sha512-BJiRA8L0L2+84uoG2SSfkp0kclBuN+vQKf217pK7pMlwEO2ZEg3MtO2/o+l8Qpr8Nbejg8tmL1ZHD1jmhiaaqg==} + butterchurn@3.0.0-beta.5: + resolution: {integrity: sha512-BStK4OAbBb9Pvt8PuQlS4WVmYBwU1KuDMRHF1V89QjoIFauAqq7tpV4EpYXj7K563r5daLrMX+2y5DBhZZ9Xig==} cac@6.7.14: resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} @@ -2573,10 +2573,6 @@ packages: core-js-compat@3.47.0: resolution: {integrity: sha512-IGfuznZ/n7Kp9+nypamBhvwdwLsW6KC8IOaURw2doAK5e98AG3acVLdh0woOnEqCfUtS+Vu882JE4k/DAm3ItQ==} - core-js@2.6.12: - resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==} - deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js. - core-util-is@1.0.2: resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==} @@ -2804,6 +2800,9 @@ packages: ecma-proposal-math-extensions@0.0.2: resolution: {integrity: sha512-80BnDp2Fn7RxXlEr5HHZblniY4aQ97MOAicdWWpSo0vkQiISSE9wLR4SqxKsu4gCtXFBIPPzy8JMhay4NWRg/Q==} + eel-wasm@0.0.16: + resolution: {integrity: sha512-1tkId7I7E1Vs4fXTRsH83Sjn2S/AbzrVQKLBRGys6NLc3eVH4NBffJsdEeLHOWWUgQpVXBEP3CV/srUZNIuBnw==} + ejs@3.1.10: resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==} engines: {node: '>=0.10.0'} @@ -4724,9 +4723,6 @@ packages: regenerate@1.4.2: resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==} - regenerator-runtime@0.11.1: - resolution: {integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==} - regexp.prototype.flags@1.5.4: resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==} engines: {node: '>= 0.4'} @@ -5912,6 +5908,8 @@ snapshots: jsonpointer: 5.0.1 leven: 3.1.0 + '@assemblyscript/loader@0.17.14': {} + '@atlaskit/pragmatic-drag-and-drop-auto-scroll@2.1.2': dependencies: '@atlaskit/pragmatic-drag-and-drop': 1.7.7 @@ -8044,11 +8042,6 @@ snapshots: transitivePeerDependencies: - supports-color - babel-runtime@6.26.0: - dependencies: - core-js: 2.6.12 - regenerator-runtime: 0.11.1 - balanced-match@1.0.2: {} balanced-match@2.0.0: {} @@ -8185,16 +8178,15 @@ snapshots: transitivePeerDependencies: - supports-color - butterchurn-presets@2.4.7: - dependencies: - babel-runtime: 6.26.0 - ecma-proposal-math-extensions: 0.0.2 - lodash: 4.17.21 - - butterchurn@2.6.7: + butterchurn-presets@3.0.0-beta.4: dependencies: '@babel/runtime': 7.28.4 + + butterchurn@3.0.0-beta.5: + dependencies: + '@assemblyscript/loader': 0.17.14 ecma-proposal-math-extensions: 0.0.2 + eel-wasm: 0.0.16 cac@6.7.14: {} @@ -8423,8 +8415,6 @@ snapshots: dependencies: browserslist: 4.28.1 - core-js@2.6.12: {} - core-util-is@1.0.2: optional: true @@ -8670,6 +8660,8 @@ snapshots: ecma-proposal-math-extensions@0.0.2: {} + eel-wasm@0.0.16: {} + ejs@3.1.10: dependencies: jake: 10.9.2 @@ -10750,8 +10742,6 @@ snapshots: regenerate@1.4.2: {} - regenerator-runtime@0.11.1: {} - regexp.prototype.flags@1.5.4: dependencies: call-bind: 1.0.8 diff --git a/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer-settings-form.tsx b/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer-settings-form.tsx index 5b4af7514..5143edb08 100644 --- a/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer-settings-form.tsx +++ b/src/renderer/features/visualizer/components/audiomotionanalyzer/visualizer-settings-form.tsx @@ -2055,7 +2055,7 @@ const ButterchurnGeneralSettings = () => { const { updateProperty, visualizer } = useUpdateButterchurn(); const presetOptions = useMemo(() => { - const presets = butterchurnPresets.getPresets(); + const presets = butterchurnPresets; return Object.keys(presets).map((presetName) => ({ label: presetName, value: presetName, @@ -2110,8 +2110,10 @@ const ButterChurnCycleSettings = () => { const { t } = useTranslation(); const { updateProperty, visualizer } = useUpdateButterchurn(); + console.log(butterchurnPresets, 'number of presets'); + const presetOptions = useMemo(() => { - const presets = butterchurnPresets.getPresets(); + const presets = butterchurnPresets; return Object.keys(presets).map((presetName) => ({ label: presetName, value: presetName, diff --git a/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx b/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx index 95b93110e..dbe759742 100644 --- a/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx +++ b/src/renderer/features/visualizer/components/butternchurn/visualizer.tsx @@ -87,8 +87,7 @@ const VisualizerInner = () => { butterchurnInstance.connectAudio(gain); } - // Load preset from settings or default - const presets = butterchurnPresets.getPresets(); + const presets = butterchurnPresets; const presetNames = Object.keys(presets); if (presetNames.length > 0) { @@ -223,7 +222,7 @@ const VisualizerInner = () => { return; } - const presets = butterchurnPresets.getPresets(); + const presets = butterchurnPresets; const preset = presets[butterchurnSettings.currentPreset]; if (preset) { @@ -244,7 +243,7 @@ const VisualizerInner = () => { return; } - const presets = butterchurnPresets.getPresets(); + const presets = butterchurnPresets; const allPresetNames = Object.keys(presets); // Get the list of presets to cycle through