abcjs 6.0.0-beta.8 → 6.0.1

package/src/synth/download-buffer.js

@@ -1,26 +1,12 @@
-//    Copyright (C) 2019-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 var downloadBuffer = function(buffer) {
 	return window.URL.createObjectURL(bufferToWave(buffer.audioBuffers));
 };
 
 // Convert an AudioBuffer to a Blob using WAVE representation
 function bufferToWave(audioBuffers) {
-	var numOfChan = audioBuffers.length;
-	var length = audioBuffers[0].length * numOfChan * 2 + 44;
+	var audioBuffer = audioBuffers[0];
+	var numOfChan = audioBuffer.numberOfChannels;
+	var length = audioBuffer.length * numOfChan * 2 + 44;
 	var buffer = new ArrayBuffer(length);
 	var view = new DataView(buffer);
 	var channels = [];
@@ -38,8 +24,8 @@ function bufferToWave(audioBuffers) {
 	setUint32(16);                                 // length = 16
 	setUint16(1);                                  // PCM (uncompressed)
 	setUint16(numOfChan);
-	setUint32(audioBuffers[0].sampleRate);
-	setUint32(audioBuffers[0].sampleRate * 2 * numOfChan); // avg. bytes/sec
+	setUint32(audioBuffer.sampleRate);
+	setUint32(audioBuffer.sampleRate * 2 * numOfChan); // avg. bytes/sec
 	setUint16(numOfChan * 2);                      // block-align
 	setUint16(16);                                 // 16-bit (hardcoded in this demo)
 
@@ -47,8 +33,8 @@ function bufferToWave(audioBuffers) {
 	setUint32(length - pos - 4);                   // chunk length
 
 	// write interleaved data
-	for(i = 0; i < audioBuffers.length; i++)
-		channels.push(audioBuffers[i].getChannelData(0));
+	for(i = 0; i < numOfChan; i++)
+		channels.push(audioBuffer.getChannelData(i));
 
 	while(pos < length) {
 		for(i = 0; i < channels.length; i++) {             // interleave channels

package/src/synth/get-midi-file.js

@@ -1,22 +1,7 @@
-//    Copyright (C) 2019-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 var tunebook = require('../api/abc_tunebook');
 var midiCreate = require('../midi/abc_midi_create');
 
-var getMidiFile = function(abcString, options) {
+var getMidiFile = function(source, options) {
 	var params = {};
 	if (options) {
 		for (var key in options) {
@@ -27,7 +12,7 @@ var getMidiFile = function(abcString, options) {
 	}
 	params.generateInline = false;
 
-	function callback(div, tune, index, abcString) {
+	function callback(div, tune, index) {
 		var downloadMidi = midiCreate(tune, params);
 		switch (params.midiOutputType) {
 			case "encoded":
@@ -48,12 +33,19 @@ var getMidiFile = function(abcString, options) {
 			default:
 				return generateMidiDownloadLink(tune, params, downloadMidi, index);
 		}
-		return downloadMidi;
 	}
 
-	return tunebook.renderEngine(callback, "*", abcString, params);
+	if (typeof source === "string")
+		return tunebook.renderEngine(callback, "*", source, params);
+	else
+		return callback(null, source, 0);
 };
 
+function isFunction(functionToCheck) {
+	var getType = {};
+	return functionToCheck && getType.toString.call(functionToCheck) === '[object Function]';
+}
+
 var generateMidiDownloadLink = function(tune, midiParams, midi, index) {
 	var divClasses = ['abcjs-download-midi', 'abcjs-midi-' + index]
 	if (midiParams.downloadClass)
@@ -70,7 +62,8 @@ var generateMidiDownloadLink = function(tune, midiParams, midi, index) {
 	else
 		label = "Download MIDI for \"" + title + "\"";
 	title = title.toLowerCase().replace(/'/g, '').replace(/\W/g, '_').replace(/__/g, '_');
-	html += '<a download="' + title + '.midi" href="' + midi + '">' + label + '</a>';
+	var filename = (midiParams.fileName) ? midiParams.fileName :  title + '.midi';
+	html += '<a download="' + filename + '" href="' + midi + '">' + label + '</a>';
 	if (midiParams.postTextDownload)
 		html += midiParams.postTextDownload;
 	return html + "</div>";

package/src/synth/images/{loading.svg → loading.svg.js}

@@ -1,3 +1,7 @@
+var svg = `
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" class="abcjs-loading-svg">
     <circle cx="50" cy="50" fill="none" stroke-width="20" r="35" stroke-dasharray="160 55"></circle>
 </svg>
+`
+
+module.exports = svg

package/src/synth/images/loop.svg.js

@@ -0,0 +1,65 @@
+var svg = `
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 700 700" preserveAspectRatio="xMidYMid meet">
+	<g transform="translate(0,700) scale(0.1,-0.1)" >
+	<path d="M3111 6981 c-20 -37 -90 -55 -364 -96 -120 -18 -190 -33 -244 -55
+	-42 -17 -124 -42 -182 -56 -78 -18 -119 -34 -157 -60 -28 -19 -86 -46 -128
+	-60 -43 -13 -107 -42 -144 -64 -37 -23 -84 -46 -106 -52 -21 -7 -56 -29 -79
+	-50 -22 -22 -61 -50 -86 -63 -26 -13 -67 -40 -91 -60 -24 -20 -65 -47 -90 -60
+	-25 -13 -53 -31 -61 -41 -8 -9 -32 -30 -54 -46 -75 -54 -486 -460 -512 -507
+	-15 -25 -48 -69 -75 -98 -26 -28 -48 -57 -48 -63 0 -6 -18 -29 -39 -53 -21
+	-23 -56 -71 -77 -107 -20 -36 -50 -80 -65 -97 -16 -18 -33 -52 -40 -75 -12
+	-47 -47 -115 -84 -166 -13 -18 -30 -56 -38 -83 -8 -27 -34 -80 -56 -118 -33
+	-53 -46 -91 -62 -167 -12 -63 -34 -127 -59 -179 -42 -84 -60 -166 -60 -270 0
+	-90 26 -122 125 -154 54 -17 96 -19 430 -20 305 -1 381 2 430 14 82 22 140 51
+	153 78 6 12 22 47 37 77 14 30 38 77 54 103 15 27 34 73 40 103 7 30 28 78 48
+	107 19 28 44 74 55 101 10 28 34 67 53 87 18 20 49 61 68 90 19 30 44 63 57
+	74 13 11 36 40 52 65 59 94 232 270 306 313 20 11 57 37 82 58 25 20 70 52
+	100 72 30 19 66 47 79 61 13 14 49 35 80 46 30 12 80 37 111 56 31 19 95 45
+	143 58 48 12 110 37 139 55 63 40 127 55 323 76 83 9 208 28 279 41 156 29
+	165 29 330 4 453 -71 514 -84 606 -130 31 -16 83 -36 116 -45 32 -9 84 -34
+	115 -56 31 -21 82 -48 113 -60 32 -11 72 -33 89 -48 18 -16 59 -45 92 -65 33
+	-21 74 -51 90 -66 17 -15 49 -40 73 -54 52 -32 65 -61 50 -113 -8 -31 -61 -90
+	-277 -308 -300 -303 -361 -382 -369 -481 -2 -29 0 -66 6 -81 13 -40 88 -138
+	115 -151 12 -6 54 -26 92 -44 l70 -33 945 -2 c520 -1 975 2 1012 7 64 8 191
+	50 231 76 11 7 33 34 50 60 22 34 42 51 65 58 l32 9 0 1101 0 1102 -32 9 c-21
+	7 -44 26 -64 55 -60 84 -77 97 -140 110 -44 9 -76 10 -127 2 -59 -9 -77 -17
+	-134 -62 -37 -28 -172 -155 -301 -281 -129 -127 -249 -237 -267 -245 -25 -10
+	-41 -11 -71 -2 -58 15 -112 45 -124 69 -6 11 -35 35 -64 54 -28 18 -58 41 -66
+	50 -8 9 -41 35 -75 58 -33 22 -77 56 -99 75 -21 18 -64 46 -95 61 -31 14 -73
+	39 -93 55 -20 15 -70 40 -110 55 -40 15 -97 44 -127 64 -29 21 -78 44 -107 53
+	-30 8 -77 31 -105 51 -42 28 -73 39 -173 60 -68 14 -154 39 -196 58 -95 43
+	-131 51 -343 76 -209 24 -242 32 -279 70 l-30 29 -328 0 c-312 0 -330 -1 -339
+	-19z"></path>
+	<path d="M254 2875 c-89 -16 -107 -26 -145 -78 -32 -44 -62 -66 -91 -67 -17 0
+	-18 -61 -18 -1140 l0 -1140 24 0 c16 0 41 -17 72 -50 40 -42 61 -55 117 -72
+	l69 -21 82 23 c44 12 96 30 114 39 18 9 148 132 290 272 141 141 267 261 279
+	268 51 26 86 14 176 -61 32 -26 62 -48 66 -48 5 0 36 -25 70 -55 34 -30 74
+	-61 89 -69 15 -8 37 -28 50 -45 12 -17 50 -45 84 -62 34 -17 78 -44 98 -60 19
+	-16 61 -37 93 -48 32 -11 81 -37 107 -56 27 -20 76 -45 109 -56 33 -12 75 -31
+	93 -44 62 -45 93 -58 191 -82 54 -12 130 -37 168 -54 68 -29 180 -58 226 -59
+	62 0 183 -64 183 -96 0 -12 88 -14 639 -14 l639 0 12 30 c18 44 76 66 233 89
+	89 14 160 30 200 47 34 15 106 42 159 60 54 18 112 44 130 57 47 35 85 52 146
+	67 29 7 76 28 105 48 29 20 77 48 107 63 30 15 66 39 80 54 14 15 50 40 81 56
+	31 15 78 46 104 69 26 22 61 46 79 54 17 7 43 26 56 42 14 16 41 41 60 56 64
+	48 380 362 408 405 15 23 40 51 55 63 15 12 36 38 46 58 11 21 37 57 58 82 22
+	25 49 62 62 83 13 20 38 56 57 78 19 23 50 74 69 113 19 39 46 86 59 104 14
+	18 34 62 46 98 12 36 32 77 45 92 31 38 60 97 80 167 9 33 26 76 37 95 29 50
+	47 103 68 206 10 52 32 117 51 155 29 56 33 74 34 140 0 94 -10 108 -101 138
+	-61 20 -83 21 -463 21 -226 0 -421 -4 -451 -10 -63 -12 -86 -30 -110 -85 -10
+	-22 -33 -63 -52 -92 -21 -31 -42 -80 -53 -123 -11 -44 -32 -93 -56 -128 -20
+	-32 -47 -83 -59 -115 -12 -32 -37 -77 -56 -100 -19 -23 -50 -65 -69 -94 -19
+	-29 -44 -57 -54 -63 -11 -5 -29 -27 -42 -47 -52 -85 -234 -277 -300 -315 -25
+	-15 -53 -38 -62 -51 -9 -14 -42 -39 -74 -57 -32 -18 -75 -48 -95 -66 -21 -18
+	-59 -44 -85 -58 -26 -13 -72 -40 -100 -59 -35 -24 -78 -41 -128 -52 -47 -11
+	-99 -31 -139 -56 -69 -42 -94 -49 -391 -110 -245 -51 -425 -66 -595 -50 -168
+	16 -230 27 -330 61 -47 16 -123 35 -170 44 -98 17 -123 25 -172 58 -20 14 -71
+	37 -114 53 -44 15 -95 40 -115 56 -20 16 -70 42 -110 59 -40 16 -88 45 -108
+	63 -20 19 -55 46 -78 61 -24 14 -49 35 -55 47 -7 11 -34 33 -60 49 -50 31 -65
+	61 -53 102 4 13 130 147 281 298 236 238 277 283 299 335 15 32 35 71 46 86
+	12 18 19 44 19 76 0 42 -8 63 -53 138 -92 151 11 139 -1207 141 -798 2 -1030
+	0 -1086 -11z"></path>
+	</g>
+</svg>
+`
+
+module.exports = svg

package/src/synth/images/pause.svg.js

@@ -0,0 +1,10 @@
+var svg = `
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25" class="abcjs-pause-svg">
+  <g>
+    <rect width="8.23" height="25"/>
+    <rect width="8.23" height="25" x="17"/>
+  </g>
+</svg>
+`
+
+module.exports = svg

package/src/synth/images/play.svg.js

@@ -0,0 +1,9 @@
+var svg = `
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25" class="abcjs-play-svg">
+    <g>
+    <polygon points="4 0 23 12.5 4 25"/>
+    </g>
+</svg>
+`
+
+module.exports = svg

package/src/synth/images/{reset.svg → reset.svg.js}

@@ -1,6 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25">
+var svg = `
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25">
   <g>
     <polygon points="5 12.5 24 0 24 25"/>
     <rect width="3" height="25" x="0" y="0"/>
   </g>
 </svg>
+`
+
+module.exports = svg

package/src/synth/instrument-index-to-name.js

@@ -1,18 +1,3 @@
-//    Copyright (C) 2019-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 var instrumentIndexToName = [
 	"acoustic_grand_piano",
 	"bright_acoustic_piano",
@@ -111,7 +96,7 @@ var instrumentIndexToName = [
 	"lead_5_charang",
 	"lead_6_voice",
 	"lead_7_fifths",
-	"lead_8_bass__lead",
+	"lead_8_bass_lead",
 
 	"pad_1_new_age",
 	"pad_2_warm",

package/src/synth/load-note.js

@@ -1,83 +1,44 @@
-//    Copyright (C) 2019-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 // Load one mp3 file for one note.
 // 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 getNote = function(url, instrument, name, audioContext) {
-	return new Promise(function (resolve, reject) {
-		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);
-			console.log(error);
-			return resolve({instrument: instrument, name: name, status: "error", message: error });
-		}
-
-		xhr.onload = function (e) {
-			if (this.status === 200) {
-				audioContext.decodeAudioData(this.response, onSuccess, onFailure);
-			} 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 soundsCache = require("./sounds-cache");
+
+var getNote = function (url, instrument, name, audioContext) {
+	if (!soundsCache[instrument]) soundsCache[instrument] = {};
+	var instrumentCache = soundsCache[instrument];
+
+	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})
+				}
+				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;

package/src/synth/pitch-to-note-name.js

@@ -1,18 +1,3 @@
-//    Copyright (C) 2019-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 var pitchToNoteName = {
 	21: 'A0',
 	22: 'Bb0',

package/src/synth/pitches-to-perc.js

@@ -0,0 +1,64 @@
+var pitchMap = {
+	f0: "_C",
+	n0: "=C",
+	s0: "^C",
+	x0: "C",
+	f1: "_D",
+	n1: "=D",
+	s1: "^D",
+	x1: "D",
+	f2: "_E",
+	n2: "=E",
+	s2: "^E",
+	x2: "E",
+	f3: "_F",
+	n3: "=F",
+	s3: "^F",
+	x3: "F",
+	f4: "_G",
+	n4: "=G",
+	s4: "^G",
+	x4: "G",
+	f5: "_A",
+	n5: "=A",
+	s5: "^A",
+	x5: "A",
+	f6: "_B",
+	n6: "=B",
+	s6: "^B",
+	x6: "B",
+	f7: "_c",
+	n7: "=c",
+	s7: "^c",
+	x7: "c",
+	f8: "_d",
+	n8: "=d",
+	s8: "^d",
+	x8: "d",
+	f9: "_e",
+	n9: "=e",
+	s9: "^e",
+	x9: "e",
+	f10: "_f",
+	n10: "=f",
+	s10: "^f",
+	x10: "f",
+	f11: "_g",
+	n11: "=g",
+	s11: "^g",
+	x11: "g",
+	f12: "_a",
+	n12: "=a",
+	s12: "^a",
+	x12: "a",
+	f13: "_b",
+	n13: "=b",
+	s13: "^b",
+	x13: "b",
+}
+
+function pitchesToPerc(pitchObj) {
+	var pitch = (pitchObj.accidental ? pitchObj.accidental[0] : 'x') + pitchObj.verticalPos;
+	return pitchMap[pitch];
+}
+module.exports = pitchesToPerc;

package/src/synth/place-note.js

@@ -1,84 +1,94 @@
-//    Copyright (C) 2019-2020 Paul Rosen (paul at paulrosen dot net)
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
-//    documentation files (the "Software"), to deal in the Software without restriction, including without limitation
-//    the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-//    to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-//    BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-//    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-//    DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-//    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 var soundsCache = require('./sounds-cache');
 var pitchToNoteName = require('./pitch-to-note-name');
+var centsToFactor = require("./cents-to-factor");
 
-var OfflineAC = window.OfflineAudioContext ||
-	window.webkitOfflineAudioContext;
+function placeNote(outputAudioBuffer, sampleRate, sound, startArray, volumeMultiplier, ofsMs, fadeTimeSec, noteEndSec) {
+	// sound contains { instrument, pitch, volume, len, pan, tempoMultiplier
+	// len is in whole notes. Multiply by tempoMultiplier to get seconds.
+	// ofsMs is an offset to subtract from the note to line up programs that have different length onsets.
+	var OfflineAC = window.OfflineAudioContext ||
+		window.webkitOfflineAudioContext;
 
-function placeNote(outputAudioBuffer, sampleRate, sound, startArray) {
 	var len = sound.len * sound.tempoMultiplier;
-	var offlineCtx = new OfflineAC(2,Math.floor((len+0.5)*sampleRate*2),sampleRate);
-	var noteName = pitchToNoteName[sound.pitch+60];
-	var noteBuffer = soundsCache[sound.instrument][noteName];
-	if (noteBuffer === "error") { // If the note isn't available, just leave a blank spot
-		console.log("Didn't load note: " + sound.instrument + " " + noteName);
-		return;
+	if (ofsMs)
+		len +=ofsMs/1000;
+	len -= noteEndSec;
+	if (len < 0)
+		len = 0.005; // Have some small audible length no matter how short the note is.
+	var offlineCtx = new OfflineAC(2,Math.floor((len+fadeTimeSec)*sampleRate),sampleRate);
+	var noteName = pitchToNoteName[sound.pitch];
+	var noteBufferPromise = soundsCache[sound.instrument][noteName];
+
+	if (!noteBufferPromise) {
+		// if the note isn't present then just skip it - it will leave a blank spot in the audio.
+		return Promise.resolve();
 	}
 
-	// create audio buffer
-	var source = offlineCtx.createBufferSource();
-	source.buffer = noteBuffer;
+	return noteBufferPromise
+		.then(function (response) {
+			// create audio buffer
+			var source = offlineCtx.createBufferSource();
+			source.buffer = response.audioBuffer;
 
-	// add gain
-	// volume can be between 1 to 127. This translation to gain is just trial and error.
-	// The smaller the first number, the more dynamic range between the quietest to loudest.
-	// The larger the second number, the louder it will be in general.
-	var volume = (sound.volume / 96) * 3.0;
-	source.gainNode = offlineCtx.createGain();
+			// add gain
+			// volume can be between 1 to 127. This translation to gain is just trial and error.
+			// The smaller the first number, the more dynamic range between the quietest to loudest.
+			// The larger the second number, the louder it will be in general.
+			var volume = (sound.volume / 96) * volumeMultiplier;
+			source.gainNode = offlineCtx.createGain();
 
-	// add pan if supported and present
-	if (sound.pan && offlineCtx.createStereoPanner) {
-		source.panNode = offlineCtx.createStereoPanner();
-		source.panNode.pan.setValueAtTime(sound.pan, 0);
-	}
-	source.gainNode.gain.value = volume; // Math.min(2, Math.max(0, volume));
-	source.gainNode.gain.linearRampToValueAtTime(source.gainNode.gain.value, len);
-	source.gainNode.gain.linearRampToValueAtTime(0.0, len + 0.3);
+			// add pan if supported and present
+			if (sound.pan && offlineCtx.createStereoPanner) {
+				source.panNode = offlineCtx.createStereoPanner();
+				source.panNode.pan.setValueAtTime(sound.pan, 0);
+			}
+			source.gainNode.gain.value = volume; // Math.min(2, Math.max(0, volume));
+			source.gainNode.gain.linearRampToValueAtTime(source.gainNode.gain.value, len);
+			source.gainNode.gain.linearRampToValueAtTime(0.0, len + fadeTimeSec);
 
-	// connect all the nodes
-	if (source.panNode) {
-		source.panNode.connect(offlineCtx.destination);
-		source.gainNode.connect(source.panNode);
-	} else {
-		source.gainNode.connect(offlineCtx.destination);
-	}
-	source.connect(source.gainNode);
+			if (sound.cents) {
+				source.playbackRate.value = centsToFactor(sound.cents);
+			}
 
-	// Do the process of creating the sound and placing it in the buffer
-	source.start(0);
+			// connect all the nodes
+			if (source.panNode) {
+				source.panNode.connect(offlineCtx.destination);
+				source.gainNode.connect(source.panNode);
+			} else {
+				source.gainNode.connect(offlineCtx.destination);
+			}
+			source.connect(source.gainNode);
 
-	if (source.noteOff) {
-		source.noteOff(len + 0.5);
-	} else {
-		source.stop(len + 0.5);
-	}
-	var fnResolve;
-	offlineCtx.oncomplete = function(e) {
-		if (e.renderedBuffer) { // If the system gets overloaded then this can start failing. Just drop the note if so.
-			for (var i = 0; i < startArray.length; i++) {
-				copyToChannel(outputAudioBuffer, e.renderedBuffer, Math.floor(startArray[i] * sound.tempoMultiplier * sampleRate));
+			// Do the process of creating the sound and placing it in the buffer
+			source.start(0);
+
+			if (source.noteOff) {
+				source.noteOff(len + fadeTimeSec);
+			} else {
+				source.stop(len + fadeTimeSec);
 			}
-		}
-		fnResolve();
-	};
-	offlineCtx.startRendering();
-	return new Promise(function(resolve, reject) {
-		fnResolve = resolve;
-	});
+			var fnResolve;
+			offlineCtx.oncomplete = function(e) {
+				if (e.renderedBuffer) { // If the system gets overloaded then this can start failing. Just drop the note if so.
+					for (var i = 0; i < startArray.length; i++) {
+						//Math.floor(startArray[i] * sound.tempoMultiplier * sampleRate)
+						var start = startArray[i] * sound.tempoMultiplier;
+						if (ofsMs)
+							start -=ofsMs/1000;
+						if (start < 0)
+							start = 0; // If the item that is moved back is at the very beginning of the buffer then don't move it back. To do that would be to push everything else forward. TODO-PER: this should probably be done at some point but then it would change timing in existing apps.
+						start = Math.floor(start*sampleRate);
+						copyToChannel(outputAudioBuffer, e.renderedBuffer, start);
+					}
+				}
+				fnResolve();
+			};
+			offlineCtx.startRendering();
+			return new Promise(function(resolve) {
+				fnResolve = resolve;
+			});
+		})
+		.catch(function () {});
 }
 
 var copyToChannel = function(toBuffer, fromBuffer, start) {