Switched from XMLHttpRequest to fetch with try/catch

src/parse/abc_parse_key_voice.js

@@ -682,10 +682,10 @@ var parseKeyVoice = {};
  warn("Expected value for stems in voice: " + attr.warn, line, start);
  else if (attr.err !== undefined)
  warn("Expected value for stems in voice: " + attr.err, line, start);
- else if (attr.token === 'up' || attr.token === 'down')
+ else if (attr.token === 'up' || attr.token === 'down' || attr.token === 'auto')
  multilineVars.voices[id].stem = attr.token;
  else
- warn("Expected up or down for voice stem", line, start);
+ warn("Expected up, down, or auto for voice stem", line, start);
  start += attr.len;
  break;
  case 'up':

src/synth/load-note.js

@@ -10,34 +10,45 @@ var getNote = function (url, instrument, name, audioContext) {
 
  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 + ' status=' + xhr.status));
- 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;
- });
+ // Use the fetch API instead of XMLHttpRequest
+ fetch(noteUrl)
+ .then(response => {
+
+ try{
+
+ if (!response.ok){
+ throw new Error(`HTTP error, status = ${response.status}`);
+ }
 
+ response.arrayBuffer().then(theBuffer => {
+ var noteDecoded = function noteDecoded(audioBuffer) {
+ resolve({
+ instrument: instrument,
+ name: name,
+ status: "loaded",
+ audioBuffer: audioBuffer
+ });
+ };
+
+ var maybePromise = audioContext.decodeAudioData(theBuffer, noteDecoded, function () {
+ reject(Error("Can't decode sound at " + noteUrl));
+ });
+
+ });
+
+ }
+ catch(error){
+ //console.log("note fetch error: "+error);
+ reject(Error("Can't load sound at " + noteUrl + ' status=' + error));
+ }
+
+ })
+ .catch(error => {
+ reject(Error("Can't load sound at " + noteUrl + ' status=' + error));
+ throw error;
+ });
+
+ });
  return instrumentCache[name];
 };