Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-25 19:13:54 +00:00
Code Issues Projects Releases Wiki Activity

Improve butterchurn build

Browse source
This commit is contained in:
Jordan Eldredge 2025-07-04 16:43:13 -07:00
parent d060b9042b
commit f4321173df
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
packages/webamp/js/actionCreators/milkdrop.ts
View file

@ -49,8 +49,9 @@ function normalizePresetTypes(preset: Preset): StatePreset {
export function initializePresets(presetOptions: ButterchurnOptions): Thunk {
return async (dispatch) => {
const { getPresets, importButterchurn } = presetOptions;
importButterchurn().then((butterchurn) => {
dispatch({ type: GOT_BUTTERCHURN, butterchurn: butterchurn.default });
importButterchurn().then((butterchurnModule) => {
const butterchurn = butterchurnModule.default ?? butterchurnModule;
dispatch({ type: GOT_BUTTERCHURN, butterchurn });
});
const presets = await getPresets();

16
packages/webamp/js/webampWithButterchurn.ts
View file

@ -6,8 +6,18 @@ import butterchurn from "butterchurn/dist/butterchurn.min.js"; // buterchurn@3.0
// @ts-ignore
import butterchurnPresets from "butterchurn-presets/dist/base.js"; // butterchurn-presets@3.0.0-beta.4
console.log("Using butterchurn", butterchurn);
console.log("Using butterchurn presets", butterchurnPresets);
const DEFAULT_BUTTERCHURN_WINDOW_LAYOUT = {
main: { position: { left: 0, top: 0 } },
equalizer: { position: { left: 0, top: 116 } },
playlist: {
position: { left: 0, top: 232 },
size: { extraHeight: 4, extraWidth: 0 },
},
milkdrop: {
position: { left: 275, top: 0 },
size: { extraHeight: 12, extraWidth: 7 },
},
};
export default class WebampWithButterchurn extends Webamp {
constructor(options: Options & PrivateOptions) {
@ -21,7 +31,9 @@ export default class WebampWithButterchurn extends Webamp {
return { name, butterchurnPresetObject: preset };
});
},
butterchurnOpen: true,
},
windowLayout: options.windowLayout ?? DEFAULT_BUTTERCHURN_WINDOW_LAYOUT,
});
}
}