From 723775cee76e68961cdf8930fb8bf7a9d6a8474d Mon Sep 17 00:00:00 2001
From: Derek Detweiler <derek.detweiler@gmail.com>
Date: Fri, 26 Jul 2019 09:45:50 -0400
Subject: [PATCH] This fixes a few issues with the `{src: "path/to/file", id:
 "audioId"}` format for both sound registration and sound removal.

---
 src/Sound.js | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/Sound.js b/src/Sound.js
index 291a2692..262016d7 100644
--- a/src/Sound.js
+++ b/src/Sound.js
@@ -167,12 +167,15 @@ class Sound {
 	 * @param id
 	 */
 	static removeSound(id) {
+		const hashId = (id instanceof Object && id.id) ? id.id : id;
+
 		// TODO: basepath?
-		let sample = Sound._idHash[id];
+
+		let sample = Sound._idHash[hashId];
 		if (sample) {
-			delete Sound._idHash[id];
+			delete Sound._idHash[hashId];
 			sample.destroy();
-		}else{
+		} else {
 			throw new Error("Could not remove sample - sample not found.")
 		}
 	}
@@ -311,7 +314,7 @@ class Sound {
 	 * @param sounds
 	 */
 	static registerSounds(sounds) {
-		sounds.forEach( s => Sound.registerSound(s) )
+		sounds.forEach( s => Sound.registerSound(s, s.id) );
 	}
 
 	/**
@@ -381,7 +384,7 @@ class Sound {
 				Sound._fetchByAudioBuffer(data, id, resolve, reject);
 				console.log("Fetching by audio buffer");
 
-			}else if (typeof data === "string"){
+			} else if (typeof data === "string") {
 				Sound._fetchByString(data, id, resolve, reject);
 				console.log("Fetching by string");
 
@@ -389,6 +392,10 @@ class Sound {
 				Sound._fetchByUrlArray(data, id, resolve, reject);
 				console.log("Fetching by url array");
 
+			} else if (data && data.src) {
+				Sound._fetchByString(data.src, id, resolve, reject);
+				console.log("Fetching by string");
+
 			} else if (typeof data === "object") {
 				Sound._fetchByUrlHash(data, id, resolve, reject);
 				console.log("Fetching by url hash");
@@ -416,12 +423,15 @@ class Sound {
 			data.soundJsId = data.soundJsId || "audioBuffer_" + Sound._audioBufferIdSuffix++;
 			return data.soundJsId;
 
-		}else if (typeof data === "string"){
+		} else if (typeof data === "string") {
 			return data;
 
 		} else if (data instanceof Array) {
 			return this._reserveIdFromUrlArray(data);
 
+		} else if (data && data.src) {
+			return data.src;
+
 		} else if (typeof data === "object") {
 			return this._reserveIdFromUrlHash(data);
 
@@ -532,22 +542,23 @@ class Sound {
 
 	static _fetchByUrlHash(hash, id, resolve, reject){
 		// Assume a source of the format: {<ext>:<url>} e.g. {mp3: path/to/file/sound.mp3, ogg: other/path/soundFileWithNoExtension}
-		for (let ext in data) {
-			if (!data.hasOwnProperty(ext) || !Sound.isExtensionSupported(ext, false) ) {
+		for (let ext in hash) {
+			if (!hash.hasOwnProperty(ext) || !Sound.isExtensionSupported(ext, false) ) {
 				continue;
 			}
 			//this.src = src[ext];
 			let ab = Sound._audioBuffers[id]; // TODO cleanup, move out of loop
 			if(ab instanceof AudioBuffer){
-				resolve({audioBuffer: ab, bufferId: data[ext]});
+				resolve({audioBuffer: ab, bufferId: hash[ext]});
 			}else{
-				Sound.loadAndDecodeAudio(data[ext]).then ( (audioBuffer) => {
+				Sound.loadAndDecodeAudio(hash[ext]).then ( (audioBuffer) => {
 					Sound._audioBuffers[id] = audioBuffer;
 					resolve({audioBuffer: audioBuffer, bufferId: id})
 				});
 			}
 			break; // We only need one valid url
 		}
+		reject("No supported files types found in URL hash");
 	}
 
 	static loadAndDecodeAudio(src){