abcjs 6.0.0-beta.34 → 6.0.0-beta.38

package/src/data/abc_tune.js

@@ -388,30 +388,32 @@ var Tune = function() {
 		var tempos = {};
 		for (var line = 0; line < this.engraver.staffgroups.length; line++) {
 			var group = this.engraver.staffgroups[line];
-			var firstStaff = group.staffs[0];
-			var middleC = firstStaff.absoluteY;
-			var top = middleC - firstStaff.top * spacing.STEP;
-			var lastStaff = group.staffs[group.staffs.length - 1];
-			middleC = lastStaff.absoluteY;
-			var bottom = middleC - lastStaff.bottom * spacing.STEP;
-			var height = bottom - top;
-
-			var voices = group.voices;
-			for (var v = 0; v < voices.length; v++) {
-				var noteFound = false;
-				if (!voicesArr[v])
-					voicesArr[v] = [];
-				if (measureNumber[v] === undefined)
-					measureNumber[v] = 0;
-				var elements = voices[v].children;
-				for (var elem = 0; elem < elements.length; elem++) {
-					if (elements[elem].type === "tempo")
-						tempos[measureNumber[v]] = this.getBpm(elements[elem].abcelem);
-					voicesArr[v].push({top: top, height: height, line: group.line, measureNumber: measureNumber[v], elem: elements[elem]});
-					if (elements[elem].type === 'bar' && noteFound) // Count the measures by counting the bar lines, but skip a bar line that appears at the left of the music, before any notes.
-						measureNumber[v]++;
-					if (elements[elem].type === 'note' || elements[elem].type === 'rest')
-						noteFound = true;
+			if (group && group.staffs && group.staffs.length > 0) {
+				var firstStaff = group.staffs[0];
+				var middleC = firstStaff.absoluteY;
+				var top = middleC - firstStaff.top * spacing.STEP;
+				var lastStaff = group.staffs[group.staffs.length - 1];
+				middleC = lastStaff.absoluteY;
+				var bottom = middleC - lastStaff.bottom * spacing.STEP;
+				var height = bottom - top;
+
+				var voices = group.voices;
+				for (var v = 0; v < voices.length; v++) {
+					var noteFound = false;
+					if (!voicesArr[v])
+						voicesArr[v] = [];
+					if (measureNumber[v] === undefined)
+						measureNumber[v] = 0;
+					var elements = voices[v].children;
+					for (var elem = 0; elem < elements.length; elem++) {
+						if (elements[elem].type === "tempo")
+							tempos[measureNumber[v]] = this.getBpm(elements[elem].abcelem);
+						voicesArr[v].push({top: top, height: height, line: group.line, measureNumber: measureNumber[v], elem: elements[elem]});
+						if (elements[elem].type === 'bar' && noteFound) // Count the measures by counting the bar lines, but skip a bar line that appears at the left of the music, before any notes.
+							measureNumber[v]++;
+						if (elements[elem].type === 'note' || elements[elem].type === 'rest')
+							noteFound = true;
+					}
 				}
 			}
 		}

package/src/edit/abc_editor.js

@@ -82,6 +82,17 @@ function gatherAbcParams(params) {
 			}
 		}
 	}
+	/*
+	if (params.tablature_options) {
+		abcjsParams['tablatures'] = params.tablature_options;
+	}
+	*/
+	if (abcjsParams.tablature) {
+		if (params.warnings_id) {
+			// store for plugin error handling
+			abcjsParams.tablature.warnings_id = params.warnings_id;
+		}
+	}
 	return abcjsParams;
 }
 
@@ -123,7 +134,7 @@ var Editor = function(editarea, params) {
 		    el: params.synth.el,
 		    cursorControl: params.synth.cursorControl,
 		    options: params.synth.options
-	    }
+	    };
     }
   }
 	// If the user wants midi, then store the elements that it will be written to. The element could either be passed in as an id,
@@ -219,16 +230,23 @@ Editor.prototype.redrawMidi = function() {
 Editor.prototype.modelChanged = function() {
   if (this.bReentry)
     return; // TODO is this likely? maybe, if we rewrite abc immediately w/ abc2abc
-  this.bReentry = true;
-  this.timerId = null;
-  if (this.synth && this.synth.synthControl)
-	  this.synth.synthControl.disable(true);
-
-  this.tunes = renderAbc(this.div, this.currentAbc, this.abcjsParams);
-  if (this.tunes.length > 0) {
-	  this.warnings = this.tunes[0].warnings;
-  }
-	this.redrawMidi();
+	this.bReentry = true;
+	try {
+		this.timerId = null;
+		if (this.synth && this.synth.synthControl)
+			this.synth.synthControl.disable(true);
+
+		this.tunes = renderAbc(this.div, this.currentAbc, this.abcjsParams);
+		if (this.tunes.length > 0) {
+			this.warnings = this.tunes[0].warnings;
+		}
+		this.redrawMidi();
+	} catch(error) {
+		console.error("ABCJS error: ", error);
+		if (!this.warnings)
+			this.warnings = [];
+		this.warnings.push(error.message);
+	}
 
   if (this.warningsdiv) {
     this.warningsdiv.innerHTML = (this.warnings) ? this.warnings.join("<br />") : "No errors";

package/src/parse/abc_parse.js

@@ -138,8 +138,10 @@ var Parse = function() {
 			};
 			for (var i = 0; i < this.inTie.length; i++) {
 				this.endingHoldOver.inTie.push([]);
-				for (var j = 0; j < this.inTie[i].length; j++) {
-					this.endingHoldOver.inTie[i].push(this.inTie[i][j]);
+				if (this.inTie[i]) { // if a voice is suppressed there might be a gap in the array.
+					for (var j = 0; j < this.inTie[i].length; j++) {
+						this.endingHoldOver.inTie[i].push(this.inTie[i][j]);
+					}
 				}
 			}
 			for (var key in this.inTieChord) {

package/src/parse/abc_parse_directive.js

@@ -39,6 +39,9 @@ var parseDirective = {};
 		tune.formatting.footerfont  = { face: "\"Times New Roman\"", size: 12, weight: "normal", style: "normal", decoration: "none" };
 		tune.formatting.headerfont  = { face: "\"Times New Roman\"", size: 12, weight: "normal", style: "normal", decoration: "none" };
 		tune.formatting.voicefont  = { face: "\"Times New Roman\"", size: 13, weight: "bold", style: "normal", decoration: "none" };
+		tune.formatting.tablabelfont  = { face: "\"Trebuchet MS\"", size: 16, weight: "normal", style: "normal", decoration: "none" };
+		tune.formatting.tabnumberfont = { face: "\"Arial\"", size: 11, weight: "normal", style: "normal", decoration: "none" };
+		tune.formatting.tabgracefont = { face: "\"Arial\"", size: 8, weight: "normal", style: "normal", decoration: "none" };
 
 		// these are the default fonts for these element types. In the printer, these fonts might change as the tune progresses.
 		tune.formatting.annotationfont  = multilineVars.annotationfont;
@@ -390,7 +393,7 @@ var parseDirective = {};
 	var interpretPercMap = function(restOfString) {
 		var tokens = restOfString.split(/\s+/); // Allow multiple spaces.
 		if (tokens.length !== 2 && tokens.length !== 3)
-			return { error: 'Expected parameters "abc-note", "drum-sound", and optionally "note-head"'}
+			return { error: 'Expected parameters "abc-note", "drum-sound", and optionally "note-head"'};
 		var key = tokens[0];
 		// The percussion sound can either be a MIDI number or a drum name. If it is not a number then check for a name.
 		var pitch = parseInt(tokens[1], 10);
@@ -403,7 +406,7 @@ var parseDirective = {};
 		if (tokens.length === 3)
 			value.noteHead = tokens[2];
 		return { key: key, value: value };
-	}
+	};
 
 	var getRequiredMeasurement = function(cmd, tokens) {
 		var points = tokenizer.getMeasurement(tokens);
@@ -875,13 +878,13 @@ var parseDirective = {};
 				break;
 			case "begintext":
 				var textBlock = '';
-				line = tokenizer.nextLine()
+				line = tokenizer.nextLine();
 				while(line && line.indexOf('%%endtext') !== 0) {
 					if (parseCommon.startsWith(line, "%%"))
 						textBlock += line.substring(2) + "\n";
 					else
 						textBlock += line + "\n";
-					line = tokenizer.nextLine()
+					line = tokenizer.nextLine();
 				}
 				tuneBuilder.addText(textBlock, { startChar: multilineVars.iChar, endChar: multilineVars.iChar+textBlock.length+7});
 				break;
@@ -889,9 +892,9 @@ var parseDirective = {};
 				multilineVars.continueall = true;
 				break;
 			case "beginps":
-				line = tokenizer.nextLine()
+				line = tokenizer.nextLine();
 				while(line && line.indexOf('%%endps') !== 0) {
-					tokenizer.nextLine()
+					tokenizer.nextLine();
 				}
 				warn("Postscript ignored", str, 0);
 				break;
@@ -1152,6 +1155,9 @@ var parseDirective = {};
 					case "vocalfont":
 					case "wordsfont":
 					case "annotationfont":
+					case "tablabelfont":
+					case "tabnumberfont":
+					case "tabgracefont":
 						getChangingFont(cmd, tokens, value);
 						break;
 					case "scale":

package/src/parse/tune-builder.js

@@ -686,7 +686,7 @@ var TuneBuilder = function(tune) {
 
 	this.containsNotesStrict = function(voice) {
 		for (var i = 0; i < voice.length; i++) {
-			if (voice[i].el_type === 'note' && voice[i].rest === undefined)
+			if (voice[i].el_type === 'note' && (voice[i].rest === undefined || voice[i].chord !== undefined))
 				return true;
 		}
 		return false;

package/src/synth/abc_midi_flattener.js

@@ -220,7 +220,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 			if (currentTrackName)
 				currentTrack.unshift(currentTrackName);
 			tracks.push(currentTrack);
-			if (chordTrack.length > 0) // Don't do chords on more than one track, so turn off chord detection after we create it.
+			if (!chordTrackEmpty()) // Don't do chords on more than one track, so turn off chord detection after we create it.
 				chordTrackFinished = true;
 			if (drumTrack.length > 0) // Don't do drums on more than one track, so turn off drum after we create it.
 				drumTrackFinished = true;
@@ -229,7 +229,7 @@ var pitchesToPerc = require('./pitches-to-perc');
 		if (options.detuneOctave)
 			findOctaves(tracks, parseInt(options.detuneOctave, 10));
 
-		if (chordTrack.length > 0)
+		if (!chordTrackEmpty())
 			tracks.push(chordTrack);
 		if (drumTrack.length > 0)
 			tracks.push(drumTrack);
@@ -246,6 +246,15 @@ var pitchesToPerc = require('./pitches-to-perc');
 		}
 	}
 
+	function chordTrackEmpty() {
+		var isEmpty = true;
+		for (var i = 0; i < chordTrack.length && isEmpty; i++) {
+			if (chordTrack[i].cmd === 'note')
+				isEmpty = false
+		}
+		return isEmpty;
+	}
+
 	function timeToRealTime(time) {
 		return time/1000000;
 	}

package/src/synth/abc_midi_sequencer.js

@@ -152,6 +152,9 @@ var parseCommon = require("../parse/abc_common");
 				var voiceNumber = 0;
 				for (var j = 0; j < staves.length; j++) {
 					var staff = staves[j];
+					if (staff.clef && staff.clef.type === "TAB")
+						continue;
+
 					// For each staff line
 					for (var k = 0; k < staff.voices.length; k++) {
 						// For each voice in a staff line
@@ -235,7 +238,7 @@ var parseCommon = require("../parse/abc_common");
 										if (elem.startTriplet) {
 											tripletMultiplier = elem.tripletMultiplier;
 											tripletDurationTotal = elem.startTriplet * tripletMultiplier * elem.duration;
-											if (elem.startTriplet != elem.tripletR) { // most commonly (3:2:2
+											if (elem.startTriplet !== elem.tripletR) { // most commonly (3:2:2
 												if (v + elem.tripletR <= voice.length) {
 													var durationTotal = 0;
 													for (var w = v; w < v + elem.tripletR; w++) {

package/src/synth/create-synth.js

@@ -12,10 +12,10 @@ var soundsCache = require('./sounds-cache');
 // TODO-PER: remove the midi tests from here: I don't think the object can be constructed unless it passes.
 var notSupportedMessage = "MIDI is not supported in this browser.";
 
-var defaultSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/abcjs/";
+var originalSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/abcjs/";
 // These are the original soundfonts supplied. They will need a volume boost:
-var alternateSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/FluidR3_GM/";
-var alternateSoundFontUrl2 = "https://paulrosen.github.io/midi-js-soundfonts/MusyngKite/";
+var defaultSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/FluidR3_GM/";
+var alternateSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/MusyngKite/";
 
 function CreateSynth() {
 	var self = this;
@@ -43,20 +43,61 @@ function CreateSynth() {
 		self.soundFontUrl = params.soundFontUrl ? params.soundFontUrl : defaultSoundFontUrl;
 		if (self.soundFontUrl[self.soundFontUrl.length-1] !== '/')
 			self.soundFontUrl += '/';
-		if (params.soundFontVolumeMultiplier)
+		if (params.soundFontVolumeMultiplier || params.soundFontVolumeMultiplier === 0)
 			self.soundFontVolumeMultiplier = params.soundFontVolumeMultiplier;
-		else if (self.soundFontUrl === alternateSoundFontUrl || self.soundFontUrl === alternateSoundFontUrl2)
-			self.soundFontVolumeMultiplier = 5.0;
-		else if (self.soundFontUrl === defaultSoundFontUrl)
-			self.soundFontVolumeMultiplier = 0.5;
+		else if (self.soundFontUrl === defaultSoundFontUrl || self.soundFontUrl === alternateSoundFontUrl)
+			self.soundFontVolumeMultiplier = 3.0;
+		else if (self.soundFontUrl === originalSoundFontUrl)
+			self.soundFontVolumeMultiplier = 0.4;
 		else
 			self.soundFontVolumeMultiplier = 1.0;
 		if (params.programOffsets)
 			self.programOffsets = params.programOffsets;
-		else if (self.soundFontUrl === defaultSoundFontUrl)
+		else if (self.soundFontUrl === originalSoundFontUrl)
 			self.programOffsets = {
-				"violin": 113,
-				"trombone": 200,
+				"bright_acoustic_piano": 20,
+				"honkytonk_piano": 20,
+				"electric_piano_1": 30,
+				"electric_piano_2": 30,
+				"harpsichord": 40,
+				"clavinet": 20,
+				"celesta": 20,
+				"glockenspiel": 40,
+				"vibraphone": 30,
+				"marimba": 35,
+				"xylophone": 30,
+				"tubular_bells": 35,
+				"dulcimer": 30,
+				"drawbar_organ": 20,
+				"percussive_organ": 25,
+				"rock_organ": 20,
+				"church_organ": 40,
+				"reed_organ": 40,
+				"accordion": 40,
+				"harmonica": 40,
+				"acoustic_guitar_nylon": 20,
+				"acoustic_guitar_steel": 30,
+				"electric_guitar_jazz": 25,
+				"electric_guitar_clean": 15,
+				"electric_guitar_muted": 35,
+				"overdriven_guitar": 25,
+				"distortion_guitar": 20,
+				"guitar_harmonics": 30,
+				"electric_bass_finger": 15,
+				"electric_bass_pick": 30,
+				"fretless_bass": 40,
+				"violin": 105,
+				"viola": 50,
+				"cello": 40,
+				"contrabass": 60,
+				"trumpet": 10,
+				"trombone": 90,
+				"alto_sax": 20,
+				"tenor_sax": 20,
+				"clarinet": 20,
+				"flute": 50,
+				"banjo": 50,
+				"woodblock": 20,
 			};
 		else
 			self.programOffsets = {};
@@ -84,6 +125,7 @@ function CreateSynth() {
 
 		var allNotes = {};
 		var cached = [];
+		var errorNotes = [];
 		var currentInstrument = instrumentIndexToName[0];
 		self.flattened.tracks.forEach(function(track) {
 			track.forEach(function(event) {
@@ -97,10 +139,17 @@ function CreateSynth() {
 							allNotes[currentInstrument] = {};
 						if (!soundsCache[currentInstrument] || !soundsCache[currentInstrument][noteName])
 							allNotes[currentInstrument][noteName] = true;
-						else
-							cached.push(currentInstrument+":"+noteName);
-					} else
-						console.log("Can't find note: ", pitchNumber);
+						else {
+							var label2 = currentInstrument+":"+noteName
+							if (cached.indexOf(label2) < 0)
+								cached.push(label2);
+						}
+					} else {
+						var label = currentInstrument+":"+noteName
+						console.log("Can't find note: ", pitchNumber, label);
+						if (errorNotes.indexOf(label) < 0)
+							errorNotes.push(label)
+					}
 				}
 			});
 		});
@@ -124,7 +173,7 @@ function CreateSynth() {
 		return new Promise(function(resolve, reject) {
 			var results = {
 				cached: cached,
-				error: [],
+				error: errorNotes,
 				loaded: []
 			};
 
@@ -245,7 +294,7 @@ function CreateSynth() {
 			noteMapTracks.forEach(function(noteMap, trackNumber) {
 				var panDistance = panDistances && panDistances.length > trackNumber ? panDistances[trackNumber] : 0;
 				noteMap.forEach(function(note) {
-					var key = note.instrument + ':' + note.pitch + ':' +note.volume + ':' + Math.round((note.end-note.start)*1000)/1000 + ':' + panDistance + ':' + tempoMultiplier + ':' + note.cents;
+					var key = note.instrument + ':' + note.pitch + ':' +note.volume + ':' + Math.round((note.end-note.start)*1000)/1000 + ':' + panDistance + ':' + tempoMultiplier + ':' + (note.cents ? note.cents : 0);
 					if (!uniqueSounds[key])
 						uniqueSounds[key] = [];
 					uniqueSounds[key].push(note.start);
@@ -259,7 +308,7 @@ function CreateSynth() {
 				var k = Object.keys(uniqueSounds)[key2];
 				var parts = k.split(":");
 				var cents = parts[6] !== undefined ? parseFloat(parts[6]) : 0;
- 				parts = { instrument: parts[0], pitch: parseInt(parts[1],10), volume: parseInt(parts[2], 10), len: parseFloat(parts[3]), pan: parseFloat(parts[4]), tempoMultiplier: parseFloat(parts[5]), cents: cents};
+				parts = {instrument: parts[0], pitch: parseInt(parts[1], 10), volume: parseInt(parts[2], 10), len: parseFloat(parts[3]), pan: parseFloat(parts[4]), tempoMultiplier: parseFloat(parts[5]), cents: cents};
 				allPromises.push(placeNote(audioBuffer, activeAudioContext().sampleRate, parts, uniqueSounds[k], self.soundFontVolumeMultiplier, self.programOffsets[parts.instrument], fadeTimeSec, self.noteEnd/1000));
 			}
 			self.audioBuffers = [audioBuffer];
@@ -279,23 +328,29 @@ function CreateSynth() {
 	};
 
 	function setPan(numTracks, panParam) {
+		// panParam, if it is set, can be either a number representing the separation between each track,
+		// or an array, which is the absolute pan position for each track.
 		if (panParam === null || panParam === undefined)
 			return null;
 
 		var panDistances = [];
 		if (panParam.length) {
-			if (numTracks === panParam.length) {
-				var ok = true;
-				for (var pp = 0; pp < panParam.length; pp++){
+			// We received an array. If there are the same number of items in the pan array as the number of tracks,
+			// it all lines up perfectly. If there are more items in the pan array than the tracks then the excess items are ignored.
+			// If there are more tracks than items in the pan array then the remaining tracks are placed in the middle.
+			// If any of the pan numbers are out of range then they are adjusted.
+			for (var pp = 0; pp < numTracks; pp++) {
+				if (pp < panParam.length) {
 					var x = parseFloat(panParam[pp]);
-					if (x >= -1 && x <= 1)
-						panDistances.push(x);
-					else
-						ok = false;
-				}
-				if (ok)
-					return panDistances;
+					if (x < -1)
+						x = -1;
+					else if (x > 1)
+						x = 1;
+					panDistances.push(x);
+				} else
+					panDistances.push(0)
 			}
+			return panDistances;
 		} else {
 			var panNumber = parseFloat(panParam);
 			// the separation needs to be no further than 2 (i.e. -1 to 1) so test to see if there are too many tracks for the passed in distance
@@ -345,8 +400,8 @@ function CreateSynth() {
 		if (self.debugCallback)
 			self.debugCallback("pause called");
 
-	 	self.stop();
-		self.pausedTimeSec = activeAudioContext().currentTime - self.startTimeSec;
+		self.pausedTimeSec = self.stop();
+		return self.pausedTimeSec;
 	};
 
 	self.resume = function() {
@@ -395,6 +450,8 @@ function CreateSynth() {
 			}
 		});
 		self.directSource = [];
+		var elapsed = activeAudioContext().currentTime - self.startTimeSec;
+		return elapsed;
 	};
 	self.finished = function() {
 		self.startTimeSec = undefined;

package/src/synth/load-note.js

@@ -2,74 +2,43 @@
 // url = the base url for the soundfont
 // instrument = the instrument name (e.g. "acoustic_grand_piano")
 // name = the pitch name (e.g. "A3")
-var soundsCache = require('./sounds-cache');
+var soundsCache = require("./sounds-cache");
 
-var getNote = function(url, instrument, name, audioContext) {
-	return new Promise(function (resolve, reject) {
-		if (!soundsCache[instrument])
-			soundsCache[instrument] = {};
-		var instrumentCache = soundsCache[instrument];
+var getNote = function (url, instrument, name, audioContext) {
+	if (!soundsCache[instrument]) soundsCache[instrument] = {};
+	var instrumentCache = soundsCache[instrument];
 
-		if (instrumentCache[name] === 'error') {
-			return resolve({instrument: instrument, name: name, status: "error", message: "Unable to load sound font" + ' ' + url + ' ' + instrument + ' ' + name });
-		}
-		if (instrumentCache[name] === 'pending') {
-			return resolve({instrument: instrument, name: name, status: "pending"});
-		}
-		if (instrumentCache[name]) {
-			return resolve({instrument: instrument, name: name, status: "cached"});
-		}
-
-		// if (this.debugCallback)
-		// 	this.debugCallback(`Loading sound: ${instrument} ${name}`);
-		instrumentCache[name] = "pending"; // This can be called in parallel, so don't call it a second time before the first one has loaded.
-		var xhr = new XMLHttpRequest();
-		xhr.open('GET', url+instrument+'-mp3/'+name+'.mp3', true);
-		xhr.responseType = 'arraybuffer';
-
-		var self = this;
-		function onSuccess(audioBuffer) {
-			instrumentCache[name] = audioBuffer;
-			// if (self.debugCallback)
-			// 	self.debugCallback(`Sound loaded: ${instrument} ${name} ${url}`);
-			resolve({instrument: instrument, name: name, status: "loaded"});
-		}
-
-		function onFailure(error) {
-			error = "Can't decode sound. " + url + ' ' + instrument + ' ' + name + ' ' + error;
-			if (self.debugCallback)
-				self.debugCallback(error);
-			return resolve({instrument: instrument, name: name, status: "error", message: error });
-		}
-
-		xhr.onload = function (e) {
-			if (this.status === 200) {
-				try {
-					var promise = audioContext.decodeAudioData(this.response, onSuccess, onFailure);
-					// older browsers only have the callback. Newer ones will report an unhandled
-					// rejection if catch isn't handled so we need both. We don't need to report it twice, though.
-					if (promise && promise.catch)
-						promise.catch(function () {});
-				} catch(error) {
-					reject(error);
+	if (!instrumentCache[name])
+		instrumentCache[name] = new Promise(function (resolve, reject) {
+			var xhr = new XMLHttpRequest();
+			let noteUrl = url + instrument + "-mp3/" + name + ".mp3";
+			xhr.open("GET", noteUrl, true);
+			xhr.responseType = "arraybuffer";
+			xhr.onload = function () {
+				if (xhr.status !== 200) {
+					reject(Error("Can't load sound at " + noteUrl));
+					return
+				}
+				var noteDecoded = function(audioBuffer) {
+					resolve({instrument: instrument, name: name, status: "loaded", audioBuffer: audioBuffer})
 				}
-			} else {
-				instrumentCache[name] = "error"; // To keep this from trying to load repeatedly.
-				var cantLoadMp3 = "Onload error loading sound: " +  name + " " + url + " " + e.currentTarget.status + " " + e.currentTarget.statusText;
-				if (self.debugCallback)
-					self.debugCallback(cantLoadMp3);
-				return resolve({instrument: instrument, name: name, status: "error", message: cantLoadMp3 });
-			}
-		};
-		xhr.addEventListener("error", function () {
-			instrumentCache[name] = "error"; // To keep this from trying to load repeatedly.
-			var cantLoadMp3 = "Error in loading sound: " + " " + url;
-			if (self.debugCallback)
-				self.debugCallback(cantLoadMp3);
-			return resolve({instrument: instrument, name: name, status: "error", message: cantLoadMp3 });
-		}, false);
-		xhr.send();
-	});
+				var maybePromise = audioContext.decodeAudioData(xhr.response, noteDecoded, function () {
+					reject(Error("Can't decode sound at " + noteUrl));
+				});
+				// In older browsers `BaseAudioContext.decodeAudio()` did not return a promise
+				if (maybePromise && typeof maybePromise.catch === "function") maybePromise.catch(reject);
+			};
+			xhr.onerror = function () {
+				reject(Error("Can't load sound at " + noteUrl));
+			};
+			xhr.send();
+		})
+			.catch(err => {
+				console.error("Didn't load note", instrument, name, ":", err.message);
+				throw err;
+			});
+
+	return instrumentCache[name];
 };
 
 module.exports = getNote;