mercury-engine 1.0.3 → 1.0.5

package/README.md

@@ -85,6 +85,7 @@ Initialize the engine and include a callback function through { onload: }, this
 const Engine = Mercury({
 	onload: () => {
 		console.log('This callback is called when samples are loaded!');
+		console.log('The loaded samples:', Engine.getBuffers());
 	}
 });
 ```
@@ -125,10 +126,34 @@ Engine.getCode();
 Add your own samples from for example a url like raw github or freesound. The url can also contain a .json file that references multiple samples and the sample name.
 
 ```js
-Engine.addBuffers();
+Engine.addBuffers(files, callback);
 ```
 
-Get the content of all the loaded Buffers, this is returned as a ToneAudioBuffers class
+For example use a json file containing sample names and urls
+
+```js
+Engine.addBuffers('https://raw.githubusercontent.com/tmhglnd/mercury-engine/main/examples/samples/freesound-samples.json');
+```
+
+Or load samples directly by creating an array of urls
+
+```js
+let s1 = 'https://cdn.freesound.org/previews/671/671221_3797507-lq.mp3';
+let s2 = 'https://cdn.freesound.org/previews/145/145778_2101444-lq.mp3';
+
+Engine.addBuffers([s1, s2]);
+```
+
+Add a callback function, this is called when all samples are loaded
+
+```js
+Engine.addBuffers('https://someurl.json', () => {
+	console.log('This callback is called when samples are loaded!');
+	console.log('The loaded samples:', Engine.getBuffers());
+});
+```
+
+Get the content of all the loaded Buffers, this is returned as a `ToneAudioBuffers` class
 
 ```js
 Engine.getBuffers();
@@ -228,11 +253,28 @@ window.addEventListener('mercuryLog', (e) => {
 });
 ```
 
+### DOM elements from P5js
+
+It is possible to control parameters from instruments in the Mercury code by writing a string that contains `{}` with the js code inside to get the dom value. For example when using DOM elements from the P5js library, such as sliders, they can be used in the code.
+
+```js
+let slider;
+
+// p5js setup function
+function setup() {
+	noCanvas();
+	// create a slider with range 50 - 5000, initial 1000
+	slider = createSlider(50, 5000, 1000, 0);
+}
+
+// use the slider value as a cutoff frequency for the filter
+Engine.code(`new synth saw note(0 0) fx(filter low '{slider.value()}' 0.4)`);
+```
+
 ## 📋 To Do
 
 - [ ] Include OSC communcation options via socket.io
 - [ ] Use engine in the Mercury-playground instead of the other code-base
-- [ ] Allow control of parameters via DOM elements
 
 ## 🔋 Powered By
 

package/dist/mercury.js

@@ -17245,7 +17245,8 @@ class MercuryInterpreter {
 			// return if the code contains any syntax errors
 			Util.log(`Could not run because of syntax error`);
 			Util.log(`Please see Help for more information`);
-			return;
+			// return the parsetree also if there are errors
+			return this.parse;
 		}
 		// if no errors the last evaluated code is stored
 		this._code = c;
@@ -17427,6 +17428,8 @@ class MercuryInterpreter {
 				this.p5canvas.display();
 			});
 		}
+		// return the parsetree to see from outside
+		return this.parse;
 	}
 }
 module.exports = { MercuryInterpreter }
@@ -17436,7 +17439,6 @@ console.log(`
 Mercury Engine by Timo Hoogland (c) 2023
 	more info:
 	https://www.timohoogland.com
-	https://mercury.timohoogland.com
 	https://github.com/tmhglnd/mercury-playground
 	https://github.com/tmhglnd/mercury-engine
 
@@ -17463,7 +17465,7 @@ class Mercury extends MercuryInterpreter {
 		super({ hydra, p5canvas });
 
 		// store sample files in buffers
-		this.samples = JSON.parse("{\n  \"noise_a\": \"noise/noise_a.wav\",\n  \"drone_cymbal\": \"ambient/cymbal/drone_cymbal.wav\",\n  \"drone_cymbal_01\": \"ambient/cymbal/drone_cymbal_01.wav\",\n  \"clap_808\": \"drums/clap/clap_808.wav\",\n  \"clap_808_short\": \"drums/clap/clap_808_short.wav\",\n  \"clap_909\": \"drums/clap/clap_909.wav\",\n  \"clap_min\": \"drums/clap/clap_min.wav\",\n  \"hat_808\": \"drums/hat/hat_808.wav\",\n  \"hat_808_open\": \"drums/hat/hat_808_open.wav\",\n  \"hat_808_semi\": \"drums/hat/hat_808_semi.wav\",\n  \"hat_909\": \"drums/hat/hat_909.wav\",\n  \"hat_909_open\": \"drums/hat/hat_909_open.wav\",\n  \"hat_909_open_short\": \"drums/hat/hat_909_open_short.wav\",\n  \"hat_909_short\": \"drums/hat/hat_909_short.wav\",\n  \"hat_click\": \"drums/hat/hat_click.wav\",\n  \"hat_dub\": \"drums/hat/hat_dub.wav\",\n  \"hat_min\": \"drums/hat/hat_min.wav\",\n  \"hat_min_open\": \"drums/hat/hat_min_open.wav\",\n  \"kick_808\": \"drums/kick/kick_808.wav\",\n  \"kick_808_dist\": \"drums/kick/kick_808_dist.wav\",\n  \"kick_909\": \"drums/kick/kick_909.wav\",\n  \"kick_909_dist\": \"drums/kick/kick_909_dist.wav\",\n  \"kick_909_dist_long\": \"drums/kick/kick_909_dist_long.wav\",\n  \"kick_909_long\": \"drums/kick/kick_909_long.wav\",\n  \"kick_deep\": \"drums/kick/kick_deep.wav\",\n  \"kick_dub\": \"drums/kick/kick_dub.wav\",\n  \"kick_house\": \"drums/kick/kick_house.wav\",\n  \"kick_min\": \"drums/kick/kick_min.wav\",\n  \"kick_sub\": \"drums/kick/kick_sub.wav\",\n  \"kick_ua\": \"drums/kick/kick_ua.wav\",\n  \"kick_vintage\": \"drums/kick/kick_vintage.wav\",\n  \"block\": \"drums/perc/block.wav\",\n  \"block_lo\": \"drums/perc/block_lo.wav\",\n  \"bongo\": \"drums/perc/bongo.wav\",\n  \"bongo_lo\": \"drums/perc/bongo_lo.wav\",\n  \"clave_808\": \"drums/perc/clave_808.wav\",\n  \"cowbell_808\": \"drums/perc/cowbell_808.wav\",\n  \"cymbal_808\": \"drums/perc/cymbal_808.wav\",\n  \"maracas_808\": \"drums/perc/maracas_808.wav\",\n  \"snare_808\": \"drums/snare/snare_808.wav\",\n  \"snare_909\": \"drums/snare/snare_909.wav\",\n  \"snare_909_short\": \"drums/snare/snare_909_short.wav\",\n  \"snare_ac\": \"drums/snare/snare_ac.wav\",\n  \"snare_dnb\": \"drums/snare/snare_dnb.wav\",\n  \"snare_dub\": \"drums/snare/snare_dub.wav\",\n  \"snare_fat\": \"drums/snare/snare_fat.wav\",\n  \"snare_hvy\": \"drums/snare/snare_hvy.wav\",\n  \"snare_min\": \"drums/snare/snare_min.wav\",\n  \"snare_rock\": \"drums/snare/snare_rock.wav\",\n  \"snare_step\": \"drums/snare/snare_step.wav\",\n  \"tabla_01\": \"drums/tabla/tabla_01.wav\",\n  \"tabla_02\": \"drums/tabla/tabla_02.wav\",\n  \"tabla_03\": \"drums/tabla/tabla_03.wav\",\n  \"tabla_hi\": \"drums/tabla/tabla_hi.wav\",\n  \"tabla_hi_long\": \"drums/tabla/tabla_hi_long.wav\",\n  \"tabla_hi_short\": \"drums/tabla/tabla_hi_short.wav\",\n  \"tabla_lo\": \"drums/tabla/tabla_lo.wav\",\n  \"tabla_lo_long\": \"drums/tabla/tabla_lo_long.wav\",\n  \"tabla_lo_short\": \"drums/tabla/tabla_lo_short.wav\",\n  \"tabla_mid\": \"drums/tabla/tabla_mid.wav\",\n  \"tabla_mid_long\": \"drums/tabla/tabla_mid_long.wav\",\n  \"tabla_mid_short\": \"drums/tabla/tabla_mid_short.wav\",\n  \"tom_808\": \"drums/tom/tom_808.wav\",\n  \"tom_hi\": \"drums/tom/tom_hi.wav\",\n  \"tom_lo\": \"drums/tom/tom_lo.wav\",\n  \"tom_mid\": \"drums/tom/tom_mid.wav\",\n  \"tongue\": \"foley/body/tongue.wav\",\n  \"tongue_lo\": \"foley/body/tongue_lo.wav\",\n  \"shatter\": \"foley/glass/shatter.wav\",\n  \"metal\": \"foley/metal/metal.wav\",\n  \"metal_lo\": \"foley/metal/metal_lo.wav\",\n  \"wobble\": \"foley/plastic/wobble.wav\",\n  \"wobble_02\": \"foley/plastic/wobble_02.wav\",\n  \"door\": \"foley/wood/door.wav\",\n  \"scrape\": \"foley/wood/scrape.wav\",\n  \"scrape_01\": \"foley/wood/scrape_01.wav\",\n  \"wood_hit\": \"foley/wood/wood_hit.wav\",\n  \"wood_metal\": \"foley/wood/wood_metal.wav\",\n  \"wood_plate\": \"foley/wood/wood_plate.wav\",\n  \"bell\": \"idiophone/bell/bell.wav\",\n  \"chimes\": \"idiophone/chimes/chimes.wav\",\n  \"chimes_chord\": \"idiophone/chimes/chimes_chord.wav\",\n  \"chimes_chord_01\": \"idiophone/chimes/chimes_chord_01.wav\",\n  \"chimes_chord_02\": \"idiophone/chimes/chimes_chord_02.wav\",\n  \"chimes_hi\": \"idiophone/chimes/chimes_hi.wav\",\n  \"gong_hi\": \"idiophone/gong/gong_hi.wav\",\n  \"gong_lo\": \"idiophone/gong/gong_lo.wav\",\n  \"kalimba_a\": \"idiophone/kalimba/kalimba_a.wav\",\n  \"kalimba_ab\": \"idiophone/kalimba/kalimba_ab.wav\",\n  \"kalimba_cis\": \"idiophone/kalimba/kalimba_cis.wav\",\n  \"kalimba_e\": \"idiophone/kalimba/kalimba_e.wav\",\n  \"kalimba_g\": \"idiophone/kalimba/kalimba_g.wav\",\n  \"bamboo_a\": \"idiophone/marimba-bamboo/bamboo_a.wav\",\n  \"bamboo_c\": \"idiophone/marimba-bamboo/bamboo_c.wav\",\n  \"bamboo_f\": \"idiophone/marimba-bamboo/bamboo_f.wav\",\n  \"bamboo_g\": \"idiophone/marimba-bamboo/bamboo_g.wav\",\n  \"bowl_hi\": \"idiophone/singing-bowl/bowl_hi.wav\",\n  \"bowl_lo\": \"idiophone/singing-bowl/bowl_lo.wav\",\n  \"bowl_mid\": \"idiophone/singing-bowl/bowl_mid.wav\",\n  \"rhodes_8bit\": \"keys/pad/rhodes_8bit.wav\",\n  \"piano_a\": \"keys/piano/piano_a.wav\",\n  \"piano_b\": \"keys/piano/piano_b.wav\",\n  \"piano_c\": \"keys/piano/piano_c.wav\",\n  \"piano_d\": \"keys/piano/piano_d.wav\",\n  \"piano_e\": \"keys/piano/piano_e.wav\",\n  \"piano_f\": \"keys/piano/piano_f.wav\",\n  \"piano_g\": \"keys/piano/piano_g.wav\",\n  \"amen\": \"loops/breaks/amen.wav\",\n  \"amen_alt\": \"loops/breaks/amen_alt.wav\",\n  \"amen_break\": \"loops/breaks/amen_break.wav\",\n  \"amen_fill\": \"loops/breaks/amen_fill.wav\",\n  \"house\": \"loops/breaks/house.wav\",\n  \"chimes_l\": \"loops/chimes/chimes_l.wav\",\n  \"noise_c\": \"loops/noise/noise_c.wav\",\n  \"noise_e\": \"loops/noise/noise_e.wav\",\n  \"noise_e_01\": \"loops/noise/noise_e_01.wav\",\n  \"noise_mw\": \"loops/noise/noise_mw.wav\",\n  \"noise_p\": \"loops/noise/noise_p.wav\",\n  \"noise_r\": \"loops/noise/noise_r.wav\",\n  \"choir_01\": \"vocal/choir/choir_01.wav\",\n  \"choir_02\": \"vocal/choir/choir_02.wav\",\n  \"choir_03\": \"vocal/choir/choir_03.wav\",\n  \"choir_o\": \"vocal/choir/choir_o.wav\",\n  \"wiper\": \"loops/foley/car/wiper.wav\",\n  \"wiper_out\": \"loops/foley/car/wiper_out.wav\",\n  \"wood_l\": \"loops/foley/wood/wood_l.wav\",\n  \"wood_l_01\": \"loops/foley/wood/wood_l_01.wav\",\n  \"violin_a\": \"string/bowed/violin/violin_a.wav\",\n  \"violin_b\": \"string/bowed/violin/violin_b.wav\",\n  \"violin_c\": \"string/bowed/violin/violin_c.wav\",\n  \"violin_d\": \"string/bowed/violin/violin_d.wav\",\n  \"violin_e\": \"string/bowed/violin/violin_e.wav\",\n  \"violin_f\": \"string/bowed/violin/violin_f.wav\",\n  \"violin_g\": \"string/bowed/violin/violin_g.wav\",\n  \"harp_down\": \"string/plucked/harp/harp_down.wav\",\n  \"harp_up\": \"string/plucked/harp/harp_up.wav\",\n  \"pluck_a\": \"string/plucked/violin/pluck_a.wav\",\n  \"pluck_b\": \"string/plucked/violin/pluck_b.wav\",\n  \"pluck_c\": \"string/plucked/violin/pluck_c.wav\",\n  \"pluck_d\": \"string/plucked/violin/pluck_d.wav\",\n  \"pluck_e\": \"string/plucked/violin/pluck_e.wav\",\n  \"pluck_f\": \"string/plucked/violin/pluck_f.wav\",\n  \"pluck_g\": \"string/plucked/violin/pluck_g.wav\"\n}\n");
+		this.samples = JSON.parse("{\n  \"_base\": \"https://raw.githubusercontent.com/tmhglnd/mercury-playground/main/public/assets/samples/\",\n  \"noise_a\": \"noise/noise_a.wav\",\n  \"drone_cymbal\": \"ambient/cymbal/drone_cymbal.wav\",\n  \"drone_cymbal_01\": \"ambient/cymbal/drone_cymbal_01.wav\",\n  \"clap_808\": \"drums/clap/clap_808.wav\",\n  \"clap_808_short\": \"drums/clap/clap_808_short.wav\",\n  \"clap_909\": \"drums/clap/clap_909.wav\",\n  \"clap_min\": \"drums/clap/clap_min.wav\",\n  \"hat_808\": \"drums/hat/hat_808.wav\",\n  \"hat_808_open\": \"drums/hat/hat_808_open.wav\",\n  \"hat_808_semi\": \"drums/hat/hat_808_semi.wav\",\n  \"hat_909\": \"drums/hat/hat_909.wav\",\n  \"hat_909_open\": \"drums/hat/hat_909_open.wav\",\n  \"hat_909_open_short\": \"drums/hat/hat_909_open_short.wav\",\n  \"hat_909_short\": \"drums/hat/hat_909_short.wav\",\n  \"hat_click\": \"drums/hat/hat_click.wav\",\n  \"hat_dub\": \"drums/hat/hat_dub.wav\",\n  \"hat_min\": \"drums/hat/hat_min.wav\",\n  \"hat_min_open\": \"drums/hat/hat_min_open.wav\",\n  \"kick_808\": \"drums/kick/kick_808.wav\",\n  \"kick_808_dist\": \"drums/kick/kick_808_dist.wav\",\n  \"kick_909\": \"drums/kick/kick_909.wav\",\n  \"kick_909_dist\": \"drums/kick/kick_909_dist.wav\",\n  \"kick_909_dist_long\": \"drums/kick/kick_909_dist_long.wav\",\n  \"kick_909_long\": \"drums/kick/kick_909_long.wav\",\n  \"kick_deep\": \"drums/kick/kick_deep.wav\",\n  \"kick_dub\": \"drums/kick/kick_dub.wav\",\n  \"kick_house\": \"drums/kick/kick_house.wav\",\n  \"kick_min\": \"drums/kick/kick_min.wav\",\n  \"kick_sub\": \"drums/kick/kick_sub.wav\",\n  \"kick_ua\": \"drums/kick/kick_ua.wav\",\n  \"kick_vintage\": \"drums/kick/kick_vintage.wav\",\n  \"block\": \"drums/perc/block.wav\",\n  \"block_lo\": \"drums/perc/block_lo.wav\",\n  \"bongo\": \"drums/perc/bongo.wav\",\n  \"bongo_lo\": \"drums/perc/bongo_lo.wav\",\n  \"clave_808\": \"drums/perc/clave_808.wav\",\n  \"cowbell_808\": \"drums/perc/cowbell_808.wav\",\n  \"cymbal_808\": \"drums/perc/cymbal_808.wav\",\n  \"maracas_808\": \"drums/perc/maracas_808.wav\",\n  \"snare_808\": \"drums/snare/snare_808.wav\",\n  \"snare_909\": \"drums/snare/snare_909.wav\",\n  \"snare_909_short\": \"drums/snare/snare_909_short.wav\",\n  \"snare_ac\": \"drums/snare/snare_ac.wav\",\n  \"snare_dnb\": \"drums/snare/snare_dnb.wav\",\n  \"snare_dub\": \"drums/snare/snare_dub.wav\",\n  \"snare_fat\": \"drums/snare/snare_fat.wav\",\n  \"snare_hvy\": \"drums/snare/snare_hvy.wav\",\n  \"snare_min\": \"drums/snare/snare_min.wav\",\n  \"snare_rock\": \"drums/snare/snare_rock.wav\",\n  \"snare_step\": \"drums/snare/snare_step.wav\",\n  \"tabla_01\": \"drums/tabla/tabla_01.wav\",\n  \"tabla_02\": \"drums/tabla/tabla_02.wav\",\n  \"tabla_03\": \"drums/tabla/tabla_03.wav\",\n  \"tabla_hi\": \"drums/tabla/tabla_hi.wav\",\n  \"tabla_hi_long\": \"drums/tabla/tabla_hi_long.wav\",\n  \"tabla_hi_short\": \"drums/tabla/tabla_hi_short.wav\",\n  \"tabla_lo\": \"drums/tabla/tabla_lo.wav\",\n  \"tabla_lo_long\": \"drums/tabla/tabla_lo_long.wav\",\n  \"tabla_lo_short\": \"drums/tabla/tabla_lo_short.wav\",\n  \"tabla_mid\": \"drums/tabla/tabla_mid.wav\",\n  \"tabla_mid_long\": \"drums/tabla/tabla_mid_long.wav\",\n  \"tabla_mid_short\": \"drums/tabla/tabla_mid_short.wav\",\n  \"tom_808\": \"drums/tom/tom_808.wav\",\n  \"tom_hi\": \"drums/tom/tom_hi.wav\",\n  \"tom_lo\": \"drums/tom/tom_lo.wav\",\n  \"tom_mid\": \"drums/tom/tom_mid.wav\",\n  \"tongue\": \"foley/body/tongue.wav\",\n  \"tongue_lo\": \"foley/body/tongue_lo.wav\",\n  \"shatter\": \"foley/glass/shatter.wav\",\n  \"metal\": \"foley/metal/metal.wav\",\n  \"metal_lo\": \"foley/metal/metal_lo.wav\",\n  \"wobble\": \"foley/plastic/wobble.wav\",\n  \"wobble_02\": \"foley/plastic/wobble_02.wav\",\n  \"door\": \"foley/wood/door.wav\",\n  \"scrape\": \"foley/wood/scrape.wav\",\n  \"scrape_01\": \"foley/wood/scrape_01.wav\",\n  \"wood_hit\": \"foley/wood/wood_hit.wav\",\n  \"wood_metal\": \"foley/wood/wood_metal.wav\",\n  \"wood_plate\": \"foley/wood/wood_plate.wav\",\n  \"bell\": \"idiophone/bell/bell.wav\",\n  \"chimes\": \"idiophone/chimes/chimes.wav\",\n  \"chimes_chord\": \"idiophone/chimes/chimes_chord.wav\",\n  \"chimes_chord_01\": \"idiophone/chimes/chimes_chord_01.wav\",\n  \"chimes_chord_02\": \"idiophone/chimes/chimes_chord_02.wav\",\n  \"chimes_hi\": \"idiophone/chimes/chimes_hi.wav\",\n  \"gong_hi\": \"idiophone/gong/gong_hi.wav\",\n  \"gong_lo\": \"idiophone/gong/gong_lo.wav\",\n  \"kalimba_a\": \"idiophone/kalimba/kalimba_a.wav\",\n  \"kalimba_ab\": \"idiophone/kalimba/kalimba_ab.wav\",\n  \"kalimba_cis\": \"idiophone/kalimba/kalimba_cis.wav\",\n  \"kalimba_e\": \"idiophone/kalimba/kalimba_e.wav\",\n  \"kalimba_g\": \"idiophone/kalimba/kalimba_g.wav\",\n  \"bamboo_a\": \"idiophone/marimba-bamboo/bamboo_a.wav\",\n  \"bamboo_c\": \"idiophone/marimba-bamboo/bamboo_c.wav\",\n  \"bamboo_f\": \"idiophone/marimba-bamboo/bamboo_f.wav\",\n  \"bamboo_g\": \"idiophone/marimba-bamboo/bamboo_g.wav\",\n  \"bowl_hi\": \"idiophone/singing-bowl/bowl_hi.wav\",\n  \"bowl_lo\": \"idiophone/singing-bowl/bowl_lo.wav\",\n  \"bowl_mid\": \"idiophone/singing-bowl/bowl_mid.wav\",\n  \"rhodes_8bit\": \"keys/pad/rhodes_8bit.wav\",\n  \"piano_a\": \"keys/piano/piano_a.wav\",\n  \"piano_b\": \"keys/piano/piano_b.wav\",\n  \"piano_c\": \"keys/piano/piano_c.wav\",\n  \"piano_d\": \"keys/piano/piano_d.wav\",\n  \"piano_e\": \"keys/piano/piano_e.wav\",\n  \"piano_f\": \"keys/piano/piano_f.wav\",\n  \"piano_g\": \"keys/piano/piano_g.wav\",\n  \"amen\": \"loops/breaks/amen.wav\",\n  \"amen_alt\": \"loops/breaks/amen_alt.wav\",\n  \"amen_break\": \"loops/breaks/amen_break.wav\",\n  \"amen_fill\": \"loops/breaks/amen_fill.wav\",\n  \"house\": \"loops/breaks/house.wav\",\n  \"chimes_l\": \"loops/chimes/chimes_l.wav\",\n  \"noise_c\": \"loops/noise/noise_c.wav\",\n  \"noise_e\": \"loops/noise/noise_e.wav\",\n  \"noise_e_01\": \"loops/noise/noise_e_01.wav\",\n  \"noise_mw\": \"loops/noise/noise_mw.wav\",\n  \"noise_p\": \"loops/noise/noise_p.wav\",\n  \"noise_r\": \"loops/noise/noise_r.wav\",\n  \"choir_01\": \"vocal/choir/choir_01.wav\",\n  \"choir_02\": \"vocal/choir/choir_02.wav\",\n  \"choir_03\": \"vocal/choir/choir_03.wav\",\n  \"choir_o\": \"vocal/choir/choir_o.wav\",\n  \"wiper\": \"loops/foley/car/wiper.wav\",\n  \"wiper_out\": \"loops/foley/car/wiper_out.wav\",\n  \"wood_l\": \"loops/foley/wood/wood_l.wav\",\n  \"wood_l_01\": \"loops/foley/wood/wood_l_01.wav\",\n  \"violin_a\": \"string/bowed/violin/violin_a.wav\",\n  \"violin_b\": \"string/bowed/violin/violin_b.wav\",\n  \"violin_c\": \"string/bowed/violin/violin_c.wav\",\n  \"violin_d\": \"string/bowed/violin/violin_d.wav\",\n  \"violin_e\": \"string/bowed/violin/violin_e.wav\",\n  \"violin_f\": \"string/bowed/violin/violin_f.wav\",\n  \"violin_g\": \"string/bowed/violin/violin_g.wav\",\n  \"harp_down\": \"string/plucked/harp/harp_down.wav\",\n  \"harp_up\": \"string/plucked/harp/harp_up.wav\",\n  \"pluck_a\": \"string/plucked/violin/pluck_a.wav\",\n  \"pluck_b\": \"string/plucked/violin/pluck_b.wav\",\n  \"pluck_c\": \"string/plucked/violin/pluck_c.wav\",\n  \"pluck_d\": \"string/plucked/violin/pluck_d.wav\",\n  \"pluck_e\": \"string/plucked/violin/pluck_e.wav\",\n  \"pluck_f\": \"string/plucked/violin/pluck_f.wav\",\n  \"pluck_g\": \"string/plucked/violin/pluck_g.wav\"\n}\n");
 
 		// this.buffers = new Tone.ToneAudioBuffers();
 		// add the buffers via function
@@ -17492,17 +17494,26 @@ class Mercury extends MercuryInterpreter {
 		this.setLowPass(5);
 		this.setCrossFade(250);
 
+		// get the base url and add to the sample locations
+		this.baseUrl = this.samples['_base'];
+		delete this.samples['_base'];
+		Object.keys(this.samples).forEach((s) => {
+			this.samples[s] = this.baseUrl + this.samples[s];
+		});
 		// load the buffers from the github
 		this.buffers = new Tone.ToneAudioBuffers({
 			urls: this.samples,
-			baseUrl: "https://raw.githubusercontent.com/tmhglnd/mercury-playground/main/public/assets/samples/",
 			onload: () => {
-				console.log('Samples loaded', this.buffers);
+				// console.log('Samples loaded', this.buffers);
 				// executes a callback from the class constructor
 				// if a callback is provided
 				if (onload){ onload(); }
 			}
 		});
+		// this.buffers = new Tone.ToneAudioBuffers();
+		// this.addBuffers('https://raw.githubusercontent.com/tmhglnd/mercury-engine/main/src/data/samples.json', () => {
+		// 	console.log('Samples loaded', this.buffers._buffers.keys());
+		// });
 
 		// the midi status, inputs and outputs
 		this.midi = { enabled: false, inputs: [], outputs: [] };
@@ -17587,36 +17598,46 @@ class Mercury extends MercuryInterpreter {
 
 	// add files to the buffer from a single File Link
 	// an array or file paths, or a json of { name:file, ... }
-	async addBuffers(uploads){
+	// optional callback function called when all files are loaded
+	addBuffers(uploads, callback){
+		// make sure uploades is an array to iterate over
+		uploads = Array.isArray(uploads)? uploads : [uploads];
+
+		let promises = [];
+
 		// for every file from uploads
-		uploads.forEach((f) => {
-			let n = f;
-			let url = f;
-			if (f.name){
+		uploads.forEach((file) => {
+			let n = file;
+			let url = file;
+			if (file.name){
 				// get the filename from File object
-				n = f.name;
-				url = URL.createObjectURL(f);
+				n = file.name;
+				url = URL.createObjectURL(file);
 			}
-			if (Array.isArray(f)){
+			if (Array.isArray(file)){
 				// if array use first value as the name
-				n = f[0];
-				url = f[1];
+				n = file[0];
+				url = file[1];
 			}
 			if (n.endsWith('.json')){
 				// read from json if loaded is a json file
-				this.addBufferFromJson(url);
+				promises.push(Promise.resolve(this.addBufferFromJson(url)));
 			} else {
 				// otherwise read the soundfile regularly
-				this.addBufferFromURL(url, n);
+				promises.push(Promise.resolve(this.addBufferFromURL(url, n)));
 			}
 		});
+
+		Promise.all(promises).then((values, reject) => {
+			if (callback) { callback(); }
+		});
 	}
 
 	// add a single file to the buffer from URL
 	// use the name as reference in the buffer
 	// if name is undefined it will be constructed from the URL
 	// 
-	addBufferFromURL(url, n){
+	async addBufferFromURL(url, n){
 		// get file name from url string
 		n = n.split('\\').pop().split('/').pop();
 		// remove extension