abcjs 6.0.0-beta.9 → 6.0.2

package/src/synth/create-note-map.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.
-
 // Convert the input structure to a more useful structure where each item has a length of its own.
 
 var instrumentIndexToName = require('./instrument-index-to-name');
@@ -25,26 +10,30 @@ var createNoteMap = function(sequence) {
 	// TODO-PER: handle more than one note in a track
 	var nextNote = {};
 	var currentInstrument = instrumentIndexToName[0];
+	// ev.start and ev.duration are in whole notes. Need to turn them into
 	sequence.tracks.forEach(function(track, i) {
-		var currentTime = 0;
 		track.forEach(function(ev) {
 			switch (ev.cmd) {
-				case "start":
-					nextNote[ev.pitch] = { time: currentTime, instrument: currentInstrument, volume: ev.volume };
-					break;
-				case "move":
-					currentTime += ev.duration;
-					break;
-				case "stop":
-					if (nextNote[ev.pitch]) { // If unisons are requested, then there might be two starts and two stops for the same note. Only use one of them.
-						map[i].push({
+				case "note":
+					// ev contains:
+					// {"cmd":"note","pitch":72,"volume":95,"start":0.125,"duration":0.25,"instrument":0,"gap":0}
+					// where start and duration are in whole notes, gap is in 1/1920 of a second (i.e. MIDI ticks)
+					if (ev.duration > 0) {
+						var gap = ev.gap ? ev.gap : 0;
+						var len = ev.duration;
+						gap = Math.min(gap, len * 2 / 3);
+						var obj = {
 							pitch: ev.pitch,
-							instrument: nextNote[ev.pitch].instrument,
-							start: nextNote[ev.pitch].time,
-							end: currentTime,
-							volume: nextNote[ev.pitch].volume
-						});
-						delete nextNote[ev.pitch];
+							instrument: currentInstrument,
+							start: Math.round((ev.start) * 1000000)/1000000,
+							end: Math.round((ev.start + len - gap) * 1000000)/1000000,
+							volume: ev.volume
+						};
+						if (ev.style)
+							obj.style = ev.style;
+						if (ev.cents)
+							obj.cents = ev.cents;
+						map[i].push(obj);
 					}
 					break;
 				case "program":
@@ -55,7 +44,7 @@ var createNoteMap = function(sequence) {
 					break;
 				default:
 					// TODO-PER: handle other event types
-					console.log("Unhanded midi event", ev);
+					console.log("Unhandled midi event", ev);
 			}
 		});
 	});

package/src/synth/create-synth-control.js

@@ -1,109 +1,13 @@
-//    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 supportsAudio = require('./supports-audio');
 var registerAudioContext = require('./register-audio-context');
 var activeAudioContext = require('./active-audio-context');
 var parseCommon = require('../parse/abc_common');
-// TODO-PER: The require statements for svg don't play well for node apps without extra plugins. The following lines would be clearer than inlining the SVG
-// var loopImage = require('./images/loop.svg');
-// var playImage = require('./images/play.svg');
-// var pauseImage = require('./images/pause.svg');
-// var loadingImage = require('./images/loading.svg');
-// var resetImage = require('./images/reset.svg');
-var loopImage = '<svg version="1.0" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 700 700" preserveAspectRatio="xMidYMid meet">\n' +
-	'<g transform="translate(0,700) scale(0.1,-0.1)" >\n' +
-	'<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>\n' +
-	'<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>\n' +
-	'</g>\n' +
-	'</svg>\n';
-var playImage = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25" class="abcjs-play-svg">\n' +
-	'    <g>\n' +
-	'    <polygon points="4 0 23 12.5 4 25"/>\n' +
-	'    </g>\n' +
-	'</svg>';
-var pauseImage = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25" class="abcjs-pause-svg">\n' +
-	'  <g>\n' +
-	'    <rect width="8.23" height="25"/>\n' +
-	'    <rect width="8.23" height="25" x="17"/>\n' +
-	'  </g>\n' +
-	'</svg>';
-var loadingImage = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" class="abcjs-loading-svg">\n' +
-	'    <circle cx="50" cy="50" fill="none" stroke-width="20" r="35" stroke-dasharray="160 55"></circle>\n' +
-	'</svg>';
-var resetImage = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25">\n' +
-	'  <g>\n' +
-	'    <polygon points="5 12.5 24 0 24 25"/>\n' +
-	'    <rect width="3" height="25" x="0" y="0"/>\n' +
-	'  </g>\n' +
-	'</svg>';
+
+var loopImage = require('./images/loop.svg.js');
+var playImage = require('./images/play.svg.js');
+var pauseImage = require('./images/pause.svg.js');
+var loadingImage = require('./images/loading.svg.js');
+var resetImage = require('./images/reset.svg.js');
 
 function CreateSynthControl(parent, options) {
 	var self = this;
@@ -135,10 +39,22 @@ function CreateSynthControl(parent, options) {
 	buildDom(self.parent, self.options);
 	attachListeners(self);
 
+	self.disable = function(isDisabled) {
+		var el = self.parent.querySelector(".abcjs-inline-audio");
+		if (isDisabled)
+			el.classList.add("abcjs-disabled");
+		else
+			el.classList.remove("abcjs-disabled");
+	};
+	self.setWarp = function(tempo, warp) {
+		var el = self.parent.querySelector(".abcjs-midi-tempo");
+		el.value = Math.round(warp);
+		self.setTempo(tempo)
+	};
 	self.setTempo = function(tempo) {
 		var el = self.parent.querySelector(".abcjs-midi-current-tempo");
 		if (el)
-			el.innerHTML = tempo;
+			el.innerHTML = Math.round(tempo);
 	};
 	self.resetAll = function() {
 		var pushedButtons = self.parent.querySelectorAll(".abcjs-pushed");
@@ -235,6 +151,7 @@ function buildDom(parent, options) {
 		var bpm = options.bpm ? options.bpm : "BPM";
 		html += '<span class="abcjs-tempo-wrapper"><label><input class="abcjs-midi-tempo" type="number" min="1" max="300" value="100" title="' + warpTitle + '" aria-label="' + warpAria + '">%</label><span>&nbsp;(<span class="abcjs-midi-current-tempo"></span> ' + bpm + ')</span></span>\n';
 	}
+	html += '<div class="abcjs-css-warning" style="font-size: 12px;color:red;border: 1px solid red;text-align: center;width: 300px;margin-top: 4px;font-weight: bold;border-radius: 4px;">CSS required: load abcjs-audio.css</div>';
 	html += '</div>\n';
 	parent.innerHTML = html;
 }

package/src/synth/create-synth.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 getNote = require('./load-note');
 var createNoteMap = require('./create-note-map');
 var registerAudioContext = require('./register-audio-context');
@@ -21,22 +6,23 @@ var supportsAudio = require('./supports-audio');
 var pitchToNoteName = require('./pitch-to-note-name');
 var instrumentIndexToName = require('./instrument-index-to-name');
 var downloadBuffer = require('./download-buffer');
-var sequence = require('../midi/abc_midi_sequencer');
-var flatten = require('../midi/abc_midi_flattener');
 var placeNote = require('./place-note');
+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 originalSoundFontUrl = "https://paulrosen.github.io/midi-js-soundfonts/abcjs/";
+// These are the original soundfonts supplied. They will need a volume boost:
 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;
 	self.audioBufferPossible = undefined;
 	self.directSource = []; // type: AudioBufferSourceNode
-	self.startTimeSec = undefined; // the time that the midi started: used for pause/resume.
-	self.pausedTimeSec = undefined; // the time that the midi was paused: used for resume.
+	self.startTimeSec = undefined; // the time (in seconds) that the audio started: used for pause to get the pausedTimeSec.
+	self.pausedTimeSec = undefined; // the position (in seconds) that the audio was paused: used for resume.
 	self.audioBuffers = []; // cache of the buffers so starting play can be fast.
 	self.duration = undefined; // the duration of the tune in seconds.
 	self.isRunning = false; // whether there is currently a sound buffer running.
@@ -53,38 +39,117 @@ function CreateSynth() {
 		self.audioBufferPossible = self._deviceCapable();
 		if (!self.audioBufferPossible)
 			return Promise.reject({ status: "NotSupported", message: notSupportedMessage});
-		self.soundFontUrl = options.soundFontUrl ? options.soundFontUrl : defaultSoundFontUrl;
-		self.millisecondsPerMeasure = options.millisecondsPerMeasure ? options.millisecondsPerMeasure : (options.visualObj ? options.visualObj.millisecondsPerMeasure() : 1000);
 		var params = options.options ? options.options : {};
+		self.soundFontUrl = params.soundFontUrl ? params.soundFontUrl : defaultSoundFontUrl;
+		if (self.soundFontUrl[self.soundFontUrl.length-1] !== '/')
+			self.soundFontUrl += '/';
+		if (params.soundFontVolumeMultiplier || params.soundFontVolumeMultiplier === 0)
+			self.soundFontVolumeMultiplier = params.soundFontVolumeMultiplier;
+		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 === originalSoundFontUrl)
+			self.programOffsets = {
+				"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 = {};
+		var p = params.fadeLength !== undefined ? parseInt(params.fadeLength,10) : NaN;
+		self.fadeLength = isNaN(p) ? 200 : p;
+		p = params.noteEnd !== undefined ? parseInt(params.noteEnd,10) : NaN;
+		self.noteEnd = isNaN(p) ? 0 : p;
+
 		self.pan = params.pan;
 		self.meterSize = 1;
 		if (options.visualObj) {
-			var seq = sequence(options.visualObj, params);
-			self.flattened = flatten(seq, params);
-			self.meterSize = options.visualObj.getMeterFraction().num / options.visualObj.getMeterFraction().den;
+			self.flattened = options.visualObj.setUpAudio(params);
+			var meter = options.visualObj.getMeterFraction();
+			if (meter.den)
+				self.meterSize = options.visualObj.getMeterFraction().num / options.visualObj.getMeterFraction().den;
 		} else if (options.sequence)
 			self.flattened = options.sequence;
 		else
 			return Promise.reject(new Error("Must pass in either a visualObj or a sequence"));
+		self.millisecondsPerMeasure = options.millisecondsPerMeasure ? options.millisecondsPerMeasure : (options.visualObj ? options.visualObj.millisecondsPerMeasure(self.flattened.tempo) : 1000);
+		self.beatsPerMeasure = options.visualObj ? options.visualObj.getBeatsPerMeasure() : 4;
 		self.sequenceCallback = params.sequenceCallback;
 		self.callbackContext = params.callbackContext;
-		self.onEnded = options.onEnded;
+		self.onEnded = params.onEnded;
 
 		var allNotes = {};
+		var cached = [];
+		var errorNotes = [];
 		var currentInstrument = instrumentIndexToName[0];
 		self.flattened.tracks.forEach(function(track) {
 			track.forEach(function(event) {
 				if (event.cmd === "program" && instrumentIndexToName[event.instrument])
 					currentInstrument = instrumentIndexToName[event.instrument];
 				if (event.pitch !== undefined) {
-					var pitchNumber = event.pitch + 60;
+					var pitchNumber = event.pitch;
 					var noteName = pitchToNoteName[pitchNumber];
 					if (noteName) {
 						if (!allNotes[currentInstrument])
 							allNotes[currentInstrument] = {};
-						allNotes[currentInstrument][pitchToNoteName[pitchNumber]] = true;
-					} else
-						console.log("Can't find note: ", pitchNumber);
+						if (!soundsCache[currentInstrument] || !soundsCache[currentInstrument][noteName])
+							allNotes[currentInstrument][noteName] = true;
+						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)
+					}
 				}
 			});
 		});
@@ -106,14 +171,23 @@ function CreateSynth() {
 		}
 
 		return new Promise(function(resolve, reject) {
-			var results = [];
+			var results = {
+				cached: cached,
+				error: errorNotes,
+				loaded: []
+			};
 
 			var index = 0;
 			var next = function() {
 				if (index < batches.length) {
 					self._loadBatch(batches[index], self.soundFontUrl, startTime).then(function(data) {
 						startTime = activeAudioContext().currentTime;
-						results.push(data);
+						if (data) {
+							if (data.error)
+								results.error = results.error.concat(data.error);
+							if (data.loaded)
+								results.loaded = results.loaded.concat(data.loaded);
+						}
 						index++;
 						next();
 					}, reject);
@@ -167,13 +241,20 @@ function CreateSynth() {
 							}
 							self._loadBatch(newBatch, soundFontUrl, startTime, delay).then(function (response) {
 								resolve(response);
+							}).catch(function (error) {
+								reject(error);
 							});
 						}, delay);
 					});
-				} else
-					return Promise.reject(new Error("time out attempting to load: " + batch.join("/")));
+				} else {
+					var list = [];
+					for (var j = 0; j < batch.length; j++)
+						list.push(batch[j].instrument+'/'+batch[j].note)
+					return Promise.reject(new Error("timeout attempting to load: " + list.join(", ")));
+				}
 			} else
 				return Promise.resolve({loaded: loaded, cached: cached, error: error});
+		}).catch(function (error) {
 		});
 	});
 
@@ -181,6 +262,7 @@ function CreateSynth() {
 		// At this point all of the notes are loaded. This function writes them into the output buffer.
 		// Most music has a lot of repeating notes. If a note is the same pitch, volume, length, etc. as another one,
 		// It saves a lot of time to just create it once and place it repeatedly where ever it needs to be.
+		var fadeTimeSec = self.fadeLength/1000;
 		self.isRunning = false;
 		if (!self.audioBufferPossible)
 			return Promise.reject(new Error(notSupportedMessage));
@@ -194,6 +276,7 @@ function CreateSynth() {
 				self.audioBuffers = [];
 				return resolve({ status: "empty", seconds: 0});
 			}
+			self.duration += fadeTimeSec;
 			var totalSamples = Math.floor(activeAudioContext().sampleRate * self.duration);
 
 			// There might be a previous run that needs to be turned off.
@@ -211,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 + ':' + (note.end-note.start) + ':' + panDistance + ':' + tempoMultiplier;
+					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);
@@ -224,8 +307,9 @@ function CreateSynth() {
 			for (var key2 = 0; key2 < Object.keys(uniqueSounds).length; key2++) {
 				var k = Object.keys(uniqueSounds)[key2];
 				var parts = k.split(":");
-				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])};
-				allPromises.push(placeNote(audioBuffer, activeAudioContext().sampleRate, parts, uniqueSounds[k]));
+				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};
+				allPromises.push(placeNote(audioBuffer, activeAudioContext().sampleRate, parts, uniqueSounds[k], self.soundFontVolumeMultiplier, self.programOffsets[parts.instrument], fadeTimeSec, self.noteEnd/1000));
 			}
 			self.audioBuffers = [audioBuffer];
 
@@ -234,33 +318,53 @@ function CreateSynth() {
 				self.debugCallback("totalSamples = " + totalSamples);
 				self.debugCallback("creationTime = " + Math.floor((activeAudioContext().currentTime - startTime)*1000) + "ms");
 			}
+			function resolveData(me) {
+				var duration = me && me.audioBuffers && me.audioBuffers.length > 0 ? me.audioBuffers[0].duration : 0;
+				return { status: activeAudioContext().state, duration: duration}
+			}
 			Promise.all(allPromises).then(function() {
-				resolve({
-					status: "ok",
-					seconds: 0
-				});
+				// Safari iOS can mess with the audioContext state, so resume if needed.
+				if (activeAudioContext().state === "suspended") {
+					activeAudioContext().resume().then(function () {
+						resolve(resolveData(self));
+					})
+				} else if (activeAudioContext().state === "interrupted") {
+					activeAudioContext().suspend().then(function () {
+						activeAudioContext().resume().then(function () {
+							resolve(resolveData(self));
+						})
+					})
+				} else {
+					resolve(resolveData(self));
+				}
 			});
 		});
 	};
 
 	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
@@ -290,18 +394,14 @@ function CreateSynth() {
 
 	// This is called after everything is set up, so it can quickly make sound
 	self.start = function() {
-		if (self.pausedTimeSec) {
-			self.resume();
-			return;
-		}
-
 		if (!self.audioBufferPossible)
 			throw new Error(notSupportedMessage);
 		if (self.debugCallback)
 			self.debugCallback("start called");
 
-		self._kickOffSound(0);
-		self.startTimeSec = activeAudioContext().currentTime;
+		var resumePosition = self.pausedTimeSec ? self.pausedTimeSec : 0;
+		self._kickOffSound(resumePosition);
+		self.startTimeSec = activeAudioContext().currentTime - resumePosition;
 		self.pausedTimeSec = undefined;
 
 		if (self.debugCallback)
@@ -314,26 +414,28 @@ function CreateSynth() {
 		if (self.debugCallback)
 			self.debugCallback("pause called");
 
-		if (!self.pausedTimeSec) { // ignore if self is already paused.
-			self.stop();
-			self.pausedTimeSec = activeAudioContext().currentTime;
-		}
+		self.pausedTimeSec = self.stop();
+		return self.pausedTimeSec;
 	};
 
 	self.resume = function() {
-		if (!self.audioBufferPossible)
-			throw new Error(notSupportedMessage);
-		if (self.debugCallback)
-			self.debugCallback("resume called");
-
-		var offset = self.pausedTimeSec - self.startTimeSec;
-		self.startTimeSec = activeAudioContext().currentTime - offset; // We move the start time in case there is another pause/resume.
-		self.pausedTimeSec = undefined;
-		self._kickOffSound(offset);
+		self.start();
 	};
 
-	self.seek = function(percent) {
-		var offset = self.duration * percent;
+	self.seek = function(position, units) {
+		var offset;
+		switch (units) {
+			case "seconds":
+				offset = position;
+				break;
+			case "beats":
+				offset = position * self.millisecondsPerMeasure / self.beatsPerMeasure / 1000;
+				break;
+			default:
+				// this is "percent" or any illegal value
+				offset = (self.duration-self.fadeLength/1000) * position;
+				break;
+		}
 
 		// TODO-PER: can seek when paused or when playing
 		if (!self.audioBufferPossible)
@@ -344,11 +446,10 @@ function CreateSynth() {
 		if (self.isRunning) {
 			self.stop();
 			self._kickOffSound(offset);
+		} else {
+			self.pausedTimeSec = offset;
 		}
-		var pauseDistance = self.pausedTimeSec ? self.pausedTimeSec - self.startTimeSec : undefined;
-		self.startTimeSec = activeAudioContext().currentTime - offset;
-		if (self.pausedTimeSec)
-			self.pausedTimeSec = self.startTimeSec + pauseDistance;
+		self.pausedTimeSec = offset;
 	};
 
 	self.stop = function() {
@@ -363,6 +464,13 @@ function CreateSynth() {
 			}
 		});
 		self.directSource = [];
+		var elapsed = activeAudioContext().currentTime - self.startTimeSec;
+		return elapsed;
+	};
+	self.finished = function() {
+		self.startTimeSec = undefined;
+		self.pausedTimeSec = undefined;
+		self.isRunning = false;
 	};
 
 	self.download = function() {